diff options
| author | Chris Lumens <clumens@redhat.com> | 2012-06-26 16:52:43 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2012-06-26 17:28:19 -0400 |
| commit | 094593d598de4872c26d895e1d5be65462e5e86d (patch) | |
| tree | 64f1945b1de27703ac24dcf7ce1d2fb51c7765a2 /pyanaconda/bootloader.py | |
| parent | f78f9bace0ee41fc9beb8253e8f891d223bff268 (diff) | |
| download | anaconda-094593d598de4872c26d895e1d5be65462e5e86d.tar.gz anaconda-094593d598de4872c26d895e1d5be65462e5e86d.tar.xz anaconda-094593d598de4872c26d895e1d5be65462e5e86d.zip | |
Add newlines to every line in /etc/default/grub.
Also, even testing for /usr/sbin/rhcrashkernel-param is enough to trip the
"set -e" test and bring the entire process silently crashing down. So
provide a way for that to return 0 too.
Diffstat (limited to 'pyanaconda/bootloader.py')
| -rw-r--r-- | pyanaconda/bootloader.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 640b7103d..658edba61 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1360,7 +1360,7 @@ class GRUB2(GRUB): def __init__(self, storage): super(GRUB2, self).__init__(storage) self.boot_args.add("$([ -x /usr/sbin/rhcrashkernel-param ] && "\ - "/usr/sbin/rhcrashkernel-param)") + "/usr/sbin/rhcrashkernel-param || :)") # XXX we probably need special handling for raid stage1 w/ gpt disklabel # since it's unlikely there'll be a bios boot partition on each disk @@ -1430,7 +1430,7 @@ class GRUB2(GRUB): defaults_file = "%s%s" % (ROOT_PATH, self.defaults_file) defaults = open(defaults_file, "w+") defaults.write("GRUB_TIMEOUT=%d\n" % self.timeout) - defaults.write("GRUB_DISTRIBUTOR=\"$(sed 's, release .*$,,g' /etc/system-release)\"") + defaults.write("GRUB_DISTRIBUTOR=\"$(sed 's, release .*$,,g' /etc/system-release)\"\n") defaults.write("GRUB_DEFAULT=saved\n") if self.console and self.console.startswith("ttyS"): defaults.write("GRUB_TERMINAL=\"serial console\"\n") @@ -1441,7 +1441,7 @@ class GRUB2(GRUB): # boot arguments log.info("bootloader.py: used boot args: %s " % self.boot_args) defaults.write("GRUB_CMDLINE_LINUX=\"%s\"\n" % self.boot_args) - defaults.write("GRUB_DISABLE_RECOVERY=\"true\"") + defaults.write("GRUB_DISABLE_RECOVERY=\"true\"\n") defaults.write("GRUB_THEME=\"/boot/grub2/themes/system/theme.txt\"\n") defaults.close() |