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

Make sure we write the kernel config line anyway.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-04-01 15:50:13 +02:00
parent 41e7a9ae3c
commit a977b1ea40
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/grubcfg/main.py
View File

@ -87,7 +87,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
for existing_param in existing_params: for existing_param in existing_params:
existing_param_name = existing_param.split("=")[0] existing_param_name = existing_param.split("=")[0]
if existing_param_name not in ["quiet", "resume", "splash"]: #the only ones we ever add if existing_param_name not in ["quiet", "resume", "splash"]: # the only ones we ever add
kernel_params.append(existing_param) kernel_params.append(existing_param)
kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params)) kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
@ -110,6 +110,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
lines.append("{!s}=\"{!s}\"".format(key, escaped_value)) lines.append("{!s}=\"{!s}\"".format(key, escaped_value))
if not have_kernel_cmd: if not have_kernel_cmd:
kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
lines.append(kernel_cmd) lines.append(kernel_cmd)
if not have_distributor_line: if not have_distributor_line: