Magellan Linux

  • Back to homepage
    • /[magellan-source]/tags/grubby-8_40_20170706/new-kernel-pkg

    Diff of /tags/grubby-8_40_20170706/new-kernel-pkg

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    trunk/mkinitrd-magellan/grubby/new-kernel-pkg revision 925 by niro, Wed Oct 28 13:29:18 2009 UTC trunk/grubby/new-kernel-pkg revision 1702 by niro, Sat Feb 18 00:21:34 2012 UTC
    # Line 40  else Line 40  else
    40  fi  fi
    41    
    42  [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby  [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby
    43    [ -f /etc/conf.d/grubby-uboot ] && . /etc/conf.d/grubby-uboot
    44    
    45    cfgGrub2=""
    46    cfgGrub2Efi=""
    47  cfgGrub=""  cfgGrub=""
    48  cfgLilo=""  cfgLilo=""
    49    cfguBoot=""
    50  runLilo=""  runLilo=""
    51  grubConfig=""  grubConfig=""
    52    grub2Config=""
    53    grub2EfiConfig=""
    54    
    55  ARCH=$(uname -m)  ARCH=$(uname -m)
    56    
    # Line 77  then Line 83  then
    83   lilo=/sbin/zipl   lilo=/sbin/zipl
    84   runLilo="yes"   runLilo="yes"
    85   isx86=""   isx86=""
    86    elif [[ ${ARCH} = armv7l ]]
    87    then
    88     liloConfig=""
    89     bootPrefix=/boot
    90     ubootDir=${UBOOT_DIR:-"/boot/uboot"}
    91     ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    92     ubootKList=${UBOOT_KLIST:-"klist.txt"}
    93     ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
    94     ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}
    95     ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}
    96     mounted=""
    97     liloFlag=""
    98     isx86=""
    99  else  else
    100   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    101   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    102   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    103     grub2Config=/boot/grub/grub.cfg
    104     grub2EfiConfig=/boot/grub/grub-efi.cfg
    105   bootPrefix=/boot   bootPrefix=/boot
    106   liloFlag=lilo   liloFlag=lilo
    107   isx86="yes"   isx86="yes"
    # Line 89  fi Line 110  fi
    110  mode=""  mode=""
    111  version=""  version=""
    112  initrd=""  initrd=""
    113    dracut=""
    114    dracuthostonly=""
    115  initrdfile=""  initrdfile=""
    116  moddep=""  moddep=""
    117  verbose=""  verbose=""
    # Line 96  makedefault="" Line 119  makedefault=""
    119  package=""  package=""
    120  mbkernel=""  mbkernel=""
    121  mbargs=""  mbargs=""
    122    adddracutargs=""
    123    addplymouthinitrd=""
    124    
    125  usage()  usage()
    126  {  {
    127   echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd]" >&2   echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd] [--dracut]" >&2
    128   echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2   echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
    129   echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2   echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2
    130   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
    131   echo "       [--mbargs=mbargs] [--make-default]" >&2   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
    132     echo "       [--add-plymouth-initrd]" >&2
    133     echo "       [--host-only]" >&2
    134   echo "       <--install | --remove | --update> <kernel-version>" >&2   echo "       <--install | --remove | --update> <kernel-version>" >&2
    135   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
    136   exit 1   exit 1
    # Line 123  install() Line 150  install()
    150   then   then
    151   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
    152   INITRD="--initrd ${initrdfile}"   INITRD="--initrd ${initrdfile}"
    153    
    154     if [[ -n ${addplymouthinitrd} ]]
    155     then
    156     INITRD="${INITRD} --extra-initrd ${bootPrefix}/initrd-plymouth.img"
    157     fi
    158   fi   fi
    159    
    160   # FIXME: is this a good heuristic to find out if we're on iSeries?   # FIXME: is this a good heuristic to find out if we're on iSeries?
    # Line 163  install() Line 195  install()
    195   else   else
    196   title="Magellan Linux (${version})"   title="Magellan Linux (${version})"
    197   fi   fi
    198   ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub --add-kernel=${bootPrefix}/${kernelName}-${version} \
    199   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    200   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    201   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    202   else   else
    203   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    204     fi
    205     if [[ -n ${cfgGrub2} ]]
    206     then
    207     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    208    
    209     if [[ -n ${banner} ]]
    210     then
    211     title="${banner} (${version})"
    212     elif [ -f /etc/mageversion ]
    213     then
    214     title="Magellan Linux $(< /etc/mageversion) (${version})"
    215     else
    216     title="Magellan Linux (${version})"
    217     fi
    218     ${grubby} --grub2 -c ${grub2Config} \
    219     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    220     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    221     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    222     ${mbargs:+--mbargs="${mbargs}"} \
    223     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    224     else
    225     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    226     fi
    227     if [[ -n ${cfgGrub2Efi} ]]
    228     then
    229     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    230    
    231     if [[ -n ${banner} ]]
    232     then
    233     title="${banner} (${version})"
    234     elif [ -f /etc/mageversion ]
    235     then
    236     title="Magellan Linux $(< /etc/mageversion) (${version})"
    237     else
    238     title="Magellan Linux (${version})"
    239     fi
    240     ${grubby} --grub2 -c ${grub2EfiConfig} \
    241     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    242     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    243     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    244     ${mbargs:+--mbargs="${mbargs}"} \
    245     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    246     else
    247     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    248   fi   fi
    249    
    250   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 184  install() Line 260  install()
    260   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    261   then   then
    262   [[ -n ${verbose} ]] && echo "running ${lilo}"   [[ -n ${verbose} ]] && echo "running ${lilo}"
    263   if [ ! -x $lilo ]   if [ ! -x ${lilo} ]
    264   then   then
    265   [[ -n ${verbose} ]] && echo "${lilo} does not exist"   [[ -n ${verbose} ]] && echo "${lilo} does not exist"
    266   else   else
    # Line 209  remove() Line 285  remove()
    285   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    286   then   then
    287   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    288   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub --remove-kernel=${bootPrefix}/${kernelName}-${version}
    289   else   else
    290   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    291     fi
    292     if [[ -n ${cfgGrub2} ]]
    293     then
    294     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    295     ${grubby} --grub2 -c ${grub2Config} \
    296     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    297     else
    298     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    299     fi
    300     if [[ -n ${cfgGrub2Efi} ]]
    301     then
    302     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    303     ${grubby} --grub2 -c ${grub2EfiConfig} \
    304     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    305     else
    306     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    307   fi   fi
    308    
    309   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    310   then   then
    311   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"
    312   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}    \   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version} --${liloFlag}
      --${liloFlag}  
    313    
    314   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    315   then   then
    # Line 233  remove() Line 324  remove()
    324   else   else
    325   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    326   fi   fi
    327    
    328     if [[ -n ${cfguBoot} ]]
    329     then
    330     [[ -n ${verbose} ]] && echo "removing ${version} from ${ubootDir}..."
    331    
    332     if [ -f ${ubootDir}/${ubootKList} ]
    333     then
    334     tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
    335     curversion=$(tail -n1 ${ubootDir}/${ubootKList})
    336     sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList}
    337     newversion=$(tail -n1 ${tmpKList})
    338     if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
    339     then
    340     if [[ ${curversion} != ${newversion} ]]
    341     then
    342     cp -fp ${ubootDir}/uImage-${newversion} ${ubootDir}/${ubootDefaultImage}
    343     if [ $? -ne 0 ]
    344     then
    345     [[ -n ${verbose} ]] && echo "copy uImage-${newversion} error, default kernel not replaced!" && exit
    346     fi
    347     cp -fp ${ubootDir}/uInitrd-${newversion} ${ubootDir}/${ubootDefaultInitrd}
    348     if [ $? -ne 0 ]
    349     then
    350     [[ -n ${verbose} ]] && echo "copy uInitrd-${newversion} error, default Initrd not replaced!" && exit
    351     fi
    352     fi
    353    
    354     [[ -n ${verbose} ]] && echo "removing uImage-${version}"
    355     if [ -f ${ubootDir}/uImage-${version} ]
    356     then
    357     rm -f ${ubootDir}/uImage-${version}
    358     else
    359     [[ -n ${verbose} ]] && echo "uImage-${version} did not exist!"
    360     fi
    361    
    362     [[ -n ${verbose} ]] && echo "removing uInitrd-${version}"
    363     if [ -f ${ubootDir}/uInitrd-${version} ]
    364     then
    365     rm -f ${ubootDir}/uInitrd-${version}
    366     else
    367     [[ -n ${verbose} ]] && echo "uInitrd-${version} did not exist!"
    368     fi
    369    
    370     mv ${tmpKList} ${ubootDir}/${ubootKList}
    371     else
    372     [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    373     [ -f ${tmpKList} ] && rm -f ${tmpKList}
    374     fi
    375     else
    376     [[ -n ${verbose} ]] && echo "No previous kernel version. uBoot images not removed!"
    377     fi
    378     else
    379     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"
    380     fi
    381  }  }
    382    
    383  update()  update()
    384  {  {
    385     if [ ! -f ${bootPrefix}/${kernelName}-${version} ]
    386     then
    387     [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
    388     return
    389     fi
    390    
    391     INITRD=""
    392     if [ -f ${initrdfile} ]
    393     then
    394     [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
    395     INITRD="--initrd ${initrdfile}"
    396    
    397     if [[ -n ${addplymouthinitrd} ]]
    398     then
    399     INITRD="${INITRD} --extra-initrd ${bootPrefix}/initrd-plymouth.img"
    400     fi
    401     fi
    402    
    403   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    404   then   then
    405   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    406   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \
    407     ${INITRD} \
    408   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    409   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    410   else   else
    411   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    412   fi   fi
    413    
    414     if [[ -n ${cfgGrub2} ]]
    415     then
    416     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    417     ${grubby} --grub2 -c ${grub2Config} \
    418     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    419     ${INITRD} \
    420     ${kernargs:+--args="${kernargs}"} \
    421     ${removeargs:+--remove-args="${removeargs}"}
    422     else
    423     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    424     fi
    425    
    426     if [[ -n ${cfgGrub2Efi} ]]
    427     then
    428     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    429     ${grubby} --grub2 -c ${grub2EfiConfig} \
    430     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    431     ${INITRD} \
    432     ${kernargs:+--args="${kernargs}"} \
    433     ${removeargs:+--remove-args="${removeargs}"}
    434     else
    435     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    436     fi
    437    
    438   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    439   then   then
    440   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    441   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \
    442     ${INITRD} \
    443   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    444   ${removeargs:+--remove-args="${removeargs}"} \   ${removeargs:+--remove-args="${removeargs}"} \
    445   --${liloFlag}   --${liloFlag}
    # Line 268  update() Line 457  update()
    457   else   else
    458   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    459   fi   fi
    460    
    461     if [[ -n ${cfguBoot} ]]
    462     then
    463     [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."
    464    
    465     [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    466     mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 \
    467     -n ${version} -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}
    468    
    469     [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    470     mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \
    471     -n initramfs -d ${initrdfile} ${ubootDir}/uInitrd-${version}
    472    
    473     if [ -f ${ubootDir}/uImage-${version} ] && [ -f ${ubootDir}/uInitrd-${version} ]
    474     then
    475     cp -fp ${ubootDir}/uImage-${version} ${ubootDir}/${ubootDefaultImage}
    476     if [ $? -ne 0 ]
    477     then
    478     [[ -n ${verbose} ]] && echo "copy uImage-${version} error, kernel not installed!" && exit
    479     fi
    480     cp -fp ${ubootDir}/uInitrd-${version} ${ubootDir}/${ubootDefaultInitrd}
    481     if [ $? -ne 0 ]
    482     then
    483     [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    484     fi
    485     echo ${version} >> ${ubootDir}/${ubootKList}
    486     else
    487     [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    488     fi
    489     else
    490     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"
    491     fi
    492  }  }
    493    
    494  mkinitrd()  mkinitrd()
    495  {  {
    496     if [[ -n ${dracut} ]]
    497     then
    498     tool="/sbin/dracut ${dracuthostonly} -f ${initrdfile} ${version}"
    499     else
    500     tool="/sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}"
    501     fi
    502   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"
    503   /sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}   ${tool}
    504   rc=$?   rc=$?
    505   if [ ${rc} != 0 ]   if [ ${rc} != 0 ]
    506   then   then
    # Line 312  do Line 539  do
    539   initrd="remove"   initrd="remove"
    540   ;;   ;;
    541    
    542     --dracut)
    543     dracut=--dracut
    544     ;;
    545    
    546     --host-only)
    547     dracuthostonly=-H
    548     ;;
    549    
    550   --initrdfile*)   --initrdfile*)
    551   if echo $1 | grep '=' >/dev/null   if echo $1 | grep '=' >/dev/null
    552   then   then
    # Line 335  do Line 570  do
    570   --remove-args*)   --remove-args*)
    571   if echo $1 | grep '=' >/dev/null   if echo $1 | grep '=' >/dev/null
    572   then   then
    573   removeargs=$(echo $1 | sed 's/^--remove-args=//')   removeargs=$(echo $1 | sed 's/^--remove-args=//')
    574   else   else
    575   removeargs=$2   removeargs=$2
    576   shift   shift
    # Line 395  do Line 630  do
    630   fi   fi
    631   ;;   ;;
    632    
    633     --add-dracut-args)
    634     adddracutargs=--add-dracut-args
    635     ;;
    636    
    637     --add-plymouth-initrd)
    638     addplymouthinitrd=--add-plymouth-initrd
    639     ;;
    640    
    641   -v)   -v)
    642   verbose=-v   verbose=-v
    643   ;;   ;;
    # Line 433  fi Line 676  fi
    676    
    677  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)
    678    
    679  # kernel image for 2.4 is vmlinux  # kernel image for 2.4 is kernel
    680  if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]  if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
    681  then  then
    682   if [[ ${kernelmajor} = 2.4 ]]   if [[ ${kernelmajor} = 2.4 ]]
    # Line 446  fi Line 689  fi
    689  if [[ -z ${initrdfile} ]]  if [[ -z ${initrdfile} ]]
    690  then  then
    691   INITRD_NAME_PREFIX="initrd"   INITRD_NAME_PREFIX="initrd"
    692     if [[ -n ${dracut} ]]
    693     then
    694     INITRD_NAME_PREFIX="initramfs"
    695     fi
    696    
    697   if [[ $(uname -m) = ia64 ]]   if [[ $(uname -m) = ia64 ]]
    698   then   then
    # Line 456  then Line 703  then
    703  fi  fi
    704  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
    705    
    706    # add dracut i18n, keyboard and plymouth kernel args if requested
    707    if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    708    then
    709     [ -r /etc/conf.d/keymap ] && . /etc/conf.d/keymap
    710     [ -r /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont
    711    
    712     if [[ -n ${KEYMAP} ]]
    713     then
    714     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    715     fi
    716    
    717     if [[ -n ${CONSOLEFONT} ]]
    718     then
    719     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    720     fi
    721    fi
    722    
    723  # set this as the default if we have the package and it matches  # set this as the default if we have the package and it matches
    724  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&
    725   [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]   [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]
    # Line 487  then Line 751  then
    751  fi  fi
    752    
    753  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    754    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    755    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    756  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    757    
    758    # if we have a uBoot directory, check if it is mounted.
    759    # if not, mount it. Then check if a boot script exists.
    760    if [[ -n ${ubootDir} ]]
    761    then
    762     mountEntry=$(mount | grep ${ubootDir})
    763     if [[ -z ${mountEntry} ]]
    764     then
    765     mount ${ubootDevice} ${ubootDir}
    766     mounted=1
    767     fi
    768     [ -f ${ubootScript} ] && cfguBoot=1
    769    fi
    770    
    771  # if we have a lilo config on an x86 box, see if the default boot loader  # if we have a lilo config on an x86 box, see if the default boot loader
    772  # is lilo to determine if it should be run  # is lilo to determine if it should be run
    773  if [[ -n ${cfgLilo} ]] && [[ -n ${isx86} ]]  if [[ -n ${cfgLilo} ]] && [[ -n ${isx86} ]]
    Legend:
    Removed from v.925  
    changed lines
      Added in v.1702