Changeset 3588 for branches


Ignore:
Timestamp:
Jun 6, 2016, 6:23:45 PM (3 years ago)
Author:
bruno
Message:
  • Fix issues with grub2 separators in conf files
  • Add default options for Ironic support (timeout and boot_method option needed for agent)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3587 r3588  
    19371937    # Type of boot file (elilo or syslinux/isolinux)
    19381938    type=$1
    1939     if [ "$type" = "elilo" ]; then
     1939    if [ "$type" = "elilo" ] || [ "$type" = "grub2" ]; then
    19401940        sep="="
    19411941        sepdef="="
     
    19431943        sep=" "
    19441944        sepdef=" "
    1945         if [ "$type" = "grub" ]; then
    1946             sepdef="="
    1947         fi
    19481945    fi
    19491946
     
    19931990
    19941991    # Handle timeout
    1995     if [ "$type" = "grub" ]; then
    1996         sep='='
     1992    if [ "$type" = "grub2" ]; then
     1993        seppref="set "
     1994    else
     1995        seppref=""
    19971996    fi
    19981997    if [ "$CDRECOVERY" = "yes" ] ; then
    1999         echo -en "timeout${sep}10000\n"
     1998        echo -en "${seppref}timeout${sep}10000\n"
    20001999    else
    2001         echo -en "timeout${sep}${MINDI_BOOT_TIMEOUT}\n"
     2000        echo -en "${seppref}timeout${sep}${MINDI_BOOT_TIMEOUT}\n"
    20022001    fi
    20032002    echo -en "\n"
     
    33673366        BOOT_TYPE=$4
    33683367        bigdir=$MINDI_TMP/bigdir
     3368        MINDI_ADDITIONAL_BOOT_PARAMS="selinux=0 barrier=off udevtimeout=10 systemd.debug-shell boot_method=vmedia"
     3369        MINDI_BOOT_TIMEOUT=10
    33693370        PrepareBootDir
    33703371        PrepareAllTar
Note: See TracChangeset for help on using the changeset viewer.