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

[bootloader] use bootloader.conf values for overrides

Browse Source
This commit is contained in:
Philip Müller 2015-02-19 18:10:31 +01:00
parent 035ad6cbf9
commit cb271d13ed
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,14 +53,14 @@ def get_bootloader_entry_name():
def get_kernel_line(kernel_type): def get_kernel_line(kernel_type):
if "bootloaderEntryName" in libcalamares.job.configuration: if kernel_type == "fallback":
if kernel_type == "fallback": if "fallbackKernelLine" in libcalamares.job.configuration:
return libcalamares.job.configuration["fallbackKernelLine"] return libcalamares.job.configuration["fallbackKernelLine"]
else: else:
return libcalamares.job.configuration["kernelLine"]
else:
if kernel_type == "fallback":
return " (fallback)" return " (fallback)"
else:
if "kernelLine" in libcalamares.job.configuration:
return libcalamares.job.configuration["kernelLine"]
else: else:
return "" return ""