diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-06-17 12:31:38 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2014-06-25 20:46:15 +1000 |
| commit | 0e990602796bee75c42a0cf9beb5f418bd104514 (patch) | |
| tree | 78b756513feb4cc753074442c84e11087ade8cd8 /autocluster | |
| parent | bb099b27e0bb680cdf59f748880caf066646e3a2 (diff) | |
| download | autocluster-0e990602796bee75c42a0cf9beb5f418bd104514.tar.gz autocluster-0e990602796bee75c42a0cf9beb5f418bd104514.tar.xz autocluster-0e990602796bee75c42a0cf9beb5f418bd104514.zip | |
Handle grub2 configuration hacking in RHEL 7+
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'autocluster')
| -rwxr-xr-x | autocluster | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/autocluster b/autocluster index 75b9951..f3268be 100755 --- a/autocluster +++ b/autocluster @@ -720,10 +720,17 @@ setup_base_grub_conf () { echo "Adjusting grub.conf" local o="$EXTRA_KERNEL_OPTIONS" # For readability. - diskimage sed "/boot/grub/grub.conf" \ - -e "s/console=ttyS0,19200/console=ttyS0,115200/" \ - -e "s/ nodmraid//" -e "s/ nompath//" \ - -e "s/quiet/noapic divider=10${o:+ }${o}/g" + local grub_configs="/boot/grub/grub.conf" + if ! diskimage is_file "$grub_configs" ; then + grub_configs="/etc/default/grub /boot/grub2/grub.cfg" + fi + local c + for c in $grub_configs ; do + diskimage sed "$c" \ + -e "s/console=ttyS0,19200/console=ttyS0,115200/" \ + -e "s/ nodmraid//" -e "s/ nompath//" \ + -e "s/quiet/noapic divider=10${o:+ }${o}/g" + done } register_hook setup_base_hooks setup_base_grub_conf |