applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bootloader] simplify code

Browse source 
- remove unneeded double code
- add kernel lines to config
This commit is contained in:
Philip 2015-02-19 20:46:02 +01:00
parent e0cccb892f
commit 568dd9422c
2 changed files with 10 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/bootloader/bootloader.conf
View file

@ -7,6 +7,8 @@
kernel: /vmlinuz-linux kernel: /vmlinuz-linux
img: /initramfs-linux.img img: /initramfs-linux.img
fallback: /initramfs-linux-fallback.img fallback: /initramfs-linux-fallback.img
kernelLine: Linux fallback kernel
fallbackKernelLine: Linux fallback kernel
timeout: 10 timeout: 10

38
src/modules/bootloader/main.py
View file

@ -51,7 +51,7 @@ def get_bootloader_entry_name():
return branding["bootloaderEntryName"] return branding["bootloaderEntryName"]
def create_conf(uuid, conf_path): def create_conf(uuid, conf_path, kernel_line):
distribution = get_bootloader_entry_name() distribution = get_bootloader_entry_name()
kernel = libcalamares.job.configuration["kernel"] kernel = libcalamares.job.configuration["kernel"]
img = libcalamares.job.configuration["img"] img = libcalamares.job.configuration["img"]
@ -65,7 +65,7 @@ def create_conf(uuid, conf_path):
'## This is just an example config file.\n', '## This is just an example config file.\n',
'## Please edit the paths and kernel parameters according to your system.\n', '## Please edit the paths and kernel parameters according to your system.\n',
'\n', '\n',
"title {!s} GNU/Linux, with Linux core repo kernel\n".format(distribution), "title {!s} GNU/Linux, with {!s}\n".format(distribution,kernel_line),
"linux {!s}\n".format(kernel), "linux {!s}\n".format(kernel),
"initrd {!s}\n".format(img), "initrd {!s}\n".format(img),
"options root=UUID={!s} quiet resume=UUID={!s} rw\n".format(uuid, swap), "options root=UUID={!s} quiet resume=UUID={!s} rw\n".format(uuid, swap),
@ -77,32 +77,6 @@ def create_conf(uuid, conf_path):
f.close() f.close()
def create_fallback(uuid, fallback_path):
distribution = get_bootloader_entry_name()
kernel = libcalamares.job.configuration["kernel"]
fb_img = libcalamares.job.configuration["fallback"]
partitions = libcalamares.globalstorage.value("partitions")
swap = ""
for partition in partitions:
if partition["fs"] == "linuxswap":
swap = partition["uuid"]
lines = [
'## This is just an example config file.\n',
'## Please edit the paths and kernel parameters according to your system.\n',
'\n',
"title {!s} GNU/Linux, with Linux fallback kernel\n".format(distribution),
"linux {!s}\n".format(kernel),
"initrd {!s}\n".format(fb_img),
"options root=UUID={!s} quiet resume=UUID={!s} rw\n".format(uuid, swap),
]
with open(fallback_path, 'w') as f:
for l in lines:
f.write(l)
f.close()
def create_loader(loader_path): def create_loader(loader_path):
distribution = get_bootloader_entry_name() distribution = get_bootloader_entry_name()
timeout = libcalamares.job.configuration["timeout"] timeout = libcalamares.job.configuration["timeout"]
@ -154,8 +128,12 @@ def install_bootloader(boot_loader, fw_type):
print("Boot device: \"{!s}\"".format(device)) print("Boot device: \"{!s}\"".format(device))
subprocess.call(["sgdisk", "--typecode={!s}:EF00".format(boot_p), "{!s}".format(device)]) subprocess.call(["sgdisk", "--typecode={!s}:EF00".format(boot_p), "{!s}".format(device)])
subprocess.call(["gummiboot", "--path={!s}".format(install_efi_directory), "install"]) subprocess.call(["gummiboot", "--path={!s}".format(install_efi_directory), "install"])
create_conf(uuid, conf_path) kernel_line = libcalamares.job.configuration("kernelLine")
create_fallback(uuid, fallback_path) fallback_kernel_line = libcalamares.job.configuration("fallbackKernelLine")
print("Configure: \"{!s}\"".format(kernel_line))
create_conf(uuid, conf_path, kernel_line)
print("Configure: \"{!s}\"".format(fallback_kernel_line))
create_conf(uuid, fallback_path, fallback_kernel_line)
create_loader(loader_path) create_loader(loader_path)
else: else:
install_path = boot_loader["installPath"] install_path = boot_loader["installPath"]