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

grubcfg: Handle the case where expected lines are missing.

Browse Source 
Check whether we actually had a GRUB_CMDLINE_LINUX_DEFAULT and a
GRUB_DISTRIBUTOR line, add any of them if it was missing.
This commit is contained in:
Kevin Kofler 2014-11-18 03:40:47 +01:00
parent f58cca1bb2
commit d5b95d79e5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,19 +41,33 @@ def modify_grub_default(partitions, root_mount_point, distributor):
else: else:
kernel_cmd = 'GRUB_CMDLINE_LINUX_DEFAULT="quiet %s"' % use_splash kernel_cmd = 'GRUB_CMDLINE_LINUX_DEFAULT="quiet %s"' % use_splash
distributor_line = "GRUB_DISTRIBUTOR='%s'" % distributor.replace("'", "'\\''")
if not os.path.exists(default_dir): if not os.path.exists(default_dir):
os.mkdir(default_dir) os.mkdir(default_dir)
with open(default_grub, 'r') as grub_file: with open(default_grub, 'r') as grub_file:
lines = [x.strip() for x in grub_file.readlines()] lines = [x.strip() for x in grub_file.readlines()]
have_kernel_cmd = False
have_distributor_line = False
for i in range(len(lines)): for i in range(len(lines)):
if lines[i].startswith("#GRUB_CMDLINE_LINUX_DEFAULT"): if lines[i].startswith("#GRUB_CMDLINE_LINUX_DEFAULT"):
lines[i] = kernel_cmd lines[i] = kernel_cmd
have_kernel_cmd = True
elif lines[i].startswith("GRUB_CMDLINE_LINUX_DEFAULT"): elif lines[i].startswith("GRUB_CMDLINE_LINUX_DEFAULT"):
lines[i] = kernel_cmd lines[i] = kernel_cmd
have_kernel_cmd = True
elif lines[i].startswith("#GRUB_DISTRIBUTOR") or lines[i].startswith("GRUB_DISTRIBUTOR"): elif lines[i].startswith("#GRUB_DISTRIBUTOR") or lines[i].startswith("GRUB_DISTRIBUTOR"):
lines[i] = "GRUB_DISTRIBUTOR='%s'" % distributor.replace("'", "'\\''") lines[i] = distributor_line
have_distributor_line = True
if not have_kernel_cmd:
lines.append(kernel_cmd)
if not have_distributor_line:
lines.append(distributor_line)
with open(default_grub, 'w') as grub_file: with open(default_grub, 'w') as grub_file:
grub_file.write("\n".join(lines) + "\n") grub_file.write("\n".join(lines) + "\n")