Skip to content
Snippets Groups Projects
Commit 7a10e141 authored by Philip Müller's avatar Philip Müller
Browse files

[bootloader] move values kernel_line and fallback_kernel_line up

parent cb78e74a
No related branches found
No related tags found
No related merge requests found
...@@ -111,6 +111,8 @@ def install_bootloader(boot_loader, fw_type): ...@@ -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): ...@@ -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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment