From 7a10e14161e728aca59c9740228fa2d908527981 Mon Sep 17 00:00:00 2001 From: Philip Date: Thu, 19 Feb 2015 20:56:18 +0100 Subject: [PATCH] [bootloader] move values kernel_line and fallback_kernel_line up --- src/modules/bootloader/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index f651d0a9d..bbf608d97 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -111,6 +111,8 @@ def install_bootloader(boot_loader, fw_type): loader_path = os.path.join( install_efi_directory, "loader", "loader.conf") partitions = libcalamares.globalstorage.value("partitions") + kernel_line = libcalamares.job.configuration("kernelLine") + fallback_kernel_line = libcalamares.job.configuration("fallbackKernelLine") boot_p = "" device = "" for partition in partitions: @@ -128,8 +130,6 @@ def install_bootloader(boot_loader, fw_type): print("Boot device: \"{!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"]) - kernel_line = libcalamares.job.configuration("kernelLine") - 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))