Handle grub2 configuration hacking in RHEL 7+

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/autocluster b/autocluster
index 75b9951f05410238a8c7fd54492744a97d6624dc..f3268be18f5db57f07131770aa5fd214a7213ef3 100755 (executable)
--- 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