Changeset 3588 in MondoRescue for branches/3.2

Timestamp:

Jun 6, 2016, 6:23:45 PM (8 years ago)

Author:

Bruno Cornec

Message:

• Fix issues with grub2 separators in conf files
• Add default options for Ironic support (timeout and boot_method option needed for agent)

File:

• branches/3.2/mindi/mindi (modified) (4 diffs)

branches/3.2/mindi/mindi

@@ -1937 +1937 @@
     # Type of boot file (elilo or syslinux/isolinux)
     type=$1
-    if [ "$type" = "elilo" ]; then
+    if [ "$type" = "elilo" ] || [ "$type" = "grub2" ]; then
         sep="="
         sepdef="="
@@ -1943 +1943 @@
         sep=" "
         sepdef=" "
-        if [ "$type" = "grub" ]; then
-            sepdef="="
-        fi
     fi
 
@@ -1993 +1990 @@
 
     # Handle timeout
-    if [ "$type" = "grub" ]; then
-        sep='='
+    if [ "$type" = "grub2" ]; then
+        seppref="set "
+    else
+        seppref=""
     fi
     if [ "$CDRECOVERY" = "yes" ] ; then
-        echo -en "timeout${sep}10000\n"
+        echo -en "${seppref}timeout${sep}10000\n"
     else
-        echo -en "timeout${sep}${MINDI_BOOT_TIMEOUT}\n"
+        echo -en "${seppref}timeout${sep}${MINDI_BOOT_TIMEOUT}\n"
     fi
     echo -en "\n"
@@ -3367 +3366 @@
         BOOT_TYPE=$4
         bigdir=$MINDI_TMP/bigdir
+        MINDI_ADDITIONAL_BOOT_PARAMS="selinux=0 barrier=off udevtimeout=10 systemd.debug-shell boot_method=vmedia"
+        MINDI_BOOT_TIMEOUT=10
         PrepareBootDir
         PrepareAllTar