napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bootloader] move values kernel_line and fallback_kernel_line up

Browse Source
This commit is contained in:
Philip 2015-02-19 20:56:18 +01:00
parent cb78e74ae9
commit 7a10e14161
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/bootloader/main.py
View File

@ -111,6 +111,8 @@ def install_bootloader(boot_loader, fw_type):
loader_path = os.path.join( loader_path = os.path.join(
install_efi_directory, "loader", "loader.conf") install_efi_directory, "loader", "loader.conf")
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
kernel_line = libcalamares.job.configuration("kernelLine")
fallback_kernel_line = libcalamares.job.configuration("fallbackKernelLine")
boot_p = "" boot_p = ""
device = "" device = ""
for partition in partitions: for partition in partitions:
@ -128,8 +130,6 @@ 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"])
kernel_line = libcalamares.job.configuration("kernelLine")
fallback_kernel_line = libcalamares.job.configuration("fallbackKernelLine")
print("Configure: \"{!s}\"".format(kernel_line)) print("Configure: \"{!s}\"".format(kernel_line))
create_conf(uuid, conf_path, kernel_line) create_conf(uuid, conf_path, kernel_line)
print("Configure: \"{!s}\"".format(fallback_kernel_line)) print("Configure: \"{!s}\"".format(fallback_kernel_line))