Magellan Linux

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

    Diff of /tags/grubby-8_15/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 1728 by niro, Sat Feb 18 00:59:04 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    cfgExtlinux=""
    50    cfguBoot=""
    51  runLilo=""  runLilo=""
    52  grubConfig=""  grubConfig=""
    53    grub2Config=""
    54    grub2EfiConfig=""
    55    extlinuxConfig=""
    56    
    57  ARCH=$(uname -m)  ARCH=$(uname -m)
    58    
    # Line 77  then Line 85  then
    85   lilo=/sbin/zipl   lilo=/sbin/zipl
    86   runLilo="yes"   runLilo="yes"
    87   isx86=""   isx86=""
    88    elif [[ ${ARCH} = armv7l ]]
    89    then
    90     liloConfig=""
    91     bootPrefix=/boot
    92     ubootDir=${UBOOT_DIR:-"/boot/uboot"}
    93     ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    94     ubootKList=${UBOOT_KLIST:-"klist.txt"}
    95     ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
    96     ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}
    97     ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}
    98     mounted=""
    99     liloFlag=""
    100     isx86=""
    101  else  else
    102   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    103   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    104   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    105     grub2Config=/boot/grub/grub.cfg
    106     grub2EfiConfig=/boot/grub/grub-efi.cfg
    107     extlinuxConfig=/boot/extlinux/extlinux.conf
    108   bootPrefix=/boot   bootPrefix=/boot
    109   liloFlag=lilo   liloFlag=lilo
    110   isx86="yes"   isx86="yes"
    # Line 89  fi Line 113  fi
    113  mode=""  mode=""
    114  version=""  version=""
    115  initrd=""  initrd=""
    116    dracut=""
    117    dracuthostonly=""
    118  initrdfile=""  initrdfile=""
    119  moddep=""  moddep=""
    120  verbose=""  verbose=""
    121  makedefault=""  makedefault=""
    122  package=""  package=""
    123  mbkernel=""  mbkernel="${HYPERVISOR}"
    124  mbargs=""  mbargs="${HYPERVISOR_ARGS}"
    125    adddracutargs=""
    126    addplymouthinitrd=""
    127    
    128  usage()  usage()
    129  {  {
    130   echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd]" >&2   echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd] [--dracut]" >&2
    131   echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2   echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
    132   echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2   echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2
    133   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
    134   echo "       [--mbargs=mbargs] [--make-default]" >&2   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
    135     echo "       [--add-plymouth-initrd]" >&2
    136     echo "       [--host-only]" >&2
    137   echo "       <--install | --remove | --update> <kernel-version>" >&2   echo "       <--install | --remove | --update> <kernel-version>" >&2
    138   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
    139   exit 1   exit 1
    # Line 123  install() Line 153  install()
    153   then   then
    154   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
    155   INITRD="--initrd ${initrdfile}"   INITRD="--initrd ${initrdfile}"
    156    
    157     if [[ -n ${addplymouthinitrd} ]]
    158     then
    159     INITRD="${INITRD} --extra-initrd ${bootPrefix}/initrd-plymouth.img"
    160     fi
    161   fi   fi
    162    
    163   # 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 198  install()
    198   else   else
    199   title="Magellan Linux (${version})"   title="Magellan Linux (${version})"
    200   fi   fi
    201   ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    202     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    203   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    204   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    205   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    206   else   else
    207   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    208     fi
    209     if [[ -n ${cfgGrub2} ]]
    210     then
    211     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    212    
    213     if [[ -n ${banner} ]]
    214     then
    215     title="${banner} (${version})"
    216     elif [ -f /etc/mageversion ]
    217     then
    218     title="Magellan Linux $(< /etc/mageversion) (${version})"
    219     else
    220     title="Magellan Linux (${version})"
    221     fi
    222     ${grubby} --grub2 -c ${grub2Config} \
    223     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    224     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    225     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    226     ${mbargs:+--mbargs="${mbargs}"} \
    227     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    228     else
    229     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    230     fi
    231     if [[ -n ${cfgGrub2Efi} ]]
    232     then
    233     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    234    
    235     if [[ -n ${banner} ]]
    236     then
    237     title="${banner} (${version})"
    238     elif [ -f /etc/mageversion ]
    239     then
    240     title="Magellan Linux $(< /etc/mageversion) (${version})"
    241     else
    242     title="Magellan Linux (${version})"
    243     fi
    244     ${grubby} --grub2 -c ${grub2EfiConfig} \
    245     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    246     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    247     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    248     ${mbargs:+--mbargs="${mbargs}"} \
    249     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    250     else
    251     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    252   fi   fi
    253    
    254   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 184  install() Line 264  install()
    264   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    265   then   then
    266   [[ -n ${verbose} ]] && echo "running ${lilo}"   [[ -n ${verbose} ]] && echo "running ${lilo}"
    267   if [ ! -x $lilo ]   if [ ! -x ${lilo} ]
    268   then   then
    269   [[ -n ${verbose} ]] && echo "${lilo} does not exist"   [[ -n ${verbose} ]] && echo "${lilo} does not exist"
    270   else   else
    # Line 194  install() Line 274  install()
    274   else   else
    275   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    276   fi   fi
    277    
    278     if [[ -n ${cfgExtlinux} ]]
    279     then
    280     [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    281    
    282     if [[ -n ${banner} ]]
    283     then
    284     title="${banner} (${version})"
    285     elif [ -f /etc/mageversion ]
    286     then
    287     title="Magellan Linux $(< /etc/mageversion) (${version})"
    288     else
    289     title="Magellan Linux (${version})"
    290     fi
    291     ${grubby} --extlinux -c ${extlinuxConfig} \
    292     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    293     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    294     ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    295     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    296     else
    297     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    298     fi
    299  }  }
    300    
    301  remove()  remove()
    # Line 209  remove() Line 311  remove()
    311   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    312   then   then
    313   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    314   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub -c ${grubConfig} \
    315     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    316   else   else
    317   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    318     fi
    319     if [[ -n ${cfgGrub2} ]]
    320     then
    321     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    322     ${grubby} --grub2 -c ${grub2Config} \
    323     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    324     else
    325     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    326     fi
    327     if [[ -n ${cfgGrub2Efi} ]]
    328     then
    329     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    330     ${grubby} --grub2 -c ${grub2EfiConfig} \
    331     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    332     else
    333     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    334   fi   fi
    335    
    336   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    337   then   then
    338   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"
    339   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}    \   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version} --${liloFlag}
      --${liloFlag}  
    340    
    341   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    342   then   then
    # Line 233  remove() Line 351  remove()
    351   else   else
    352   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    353   fi   fi
    354    
    355     if [[ -n ${cfguBoot} ]]
    356     then
    357     [[ -n ${verbose} ]] && echo "removing ${version} from ${ubootDir}..."
    358    
    359     if [ -f ${ubootDir}/${ubootKList} ]
    360     then
    361     tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
    362     curversion=$(tail -n1 ${ubootDir}/${ubootKList})
    363     sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList}
    364     newversion=$(tail -n1 ${tmpKList})
    365     if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
    366     then
    367     if [[ ${curversion} != ${newversion} ]]
    368     then
    369     cp -fp ${ubootDir}/uImage-${newversion} ${ubootDir}/${ubootDefaultImage}
    370     if [ $? -ne 0 ]
    371     then
    372     [[ -n ${verbose} ]] && echo "copy uImage-${newversion} error, default kernel not replaced!" && exit
    373     fi
    374     cp -fp ${ubootDir}/uInitrd-${newversion} ${ubootDir}/${ubootDefaultInitrd}
    375     if [ $? -ne 0 ]
    376     then
    377     [[ -n ${verbose} ]] && echo "copy uInitrd-${newversion} error, default Initrd not replaced!" && exit
    378     fi
    379     fi
    380    
    381     [[ -n ${verbose} ]] && echo "removing uImage-${version}"
    382     if [ -f ${ubootDir}/uImage-${version} ]
    383     then
    384     rm -f ${ubootDir}/uImage-${version}
    385     else
    386     [[ -n ${verbose} ]] && echo "uImage-${version} did not exist!"
    387     fi
    388    
    389     [[ -n ${verbose} ]] && echo "removing uInitrd-${version}"
    390     if [ -f ${ubootDir}/uInitrd-${version} ]
    391     then
    392     rm -f ${ubootDir}/uInitrd-${version}
    393     else
    394     [[ -n ${verbose} ]] && echo "uInitrd-${version} did not exist!"
    395     fi
    396    
    397     mv ${tmpKList} ${ubootDir}/${ubootKList}
    398     else
    399     [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    400     [ -f ${tmpKList} ] && rm -f ${tmpKList}
    401     fi
    402     else
    403     [[ -n ${verbose} ]] && echo "No previous kernel version. uBoot images not removed!"
    404     fi
    405     else
    406     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"
    407     fi
    408    
    409     if [[ -n ${cfgExtlinux} ]]
    410     then
    411     [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    412     ${grubby} --extlinux -c ${extlinuxConfig} \
    413     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    414     else
    415     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    416     fi
    417  }  }
    418    
    419  update()  update()
    420  {  {
    421     if [ ! -f ${bootPrefix}/${kernelName}-${version} ]
    422     then
    423     [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
    424     return
    425     fi
    426    
    427     INITRD=""
    428     if [ -f ${initrdfile} ]
    429     then
    430     [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
    431     INITRD="--initrd ${initrdfile}"
    432    
    433     if [[ -n ${addplymouthinitrd} ]]
    434     then
    435     INITRD="${INITRD} --extra-initrd ${bootPrefix}/initrd-plymouth.img"
    436     fi
    437     fi
    438    
    439   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    440   then   then
    441   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    442   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    443     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    444     ${INITRD} \
    445   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    446   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    447   else   else
    448   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    449   fi   fi
    450    
    451     if [[ -n ${cfgGrub2} ]]
    452     then
    453     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    454     ${grubby} --grub2 -c ${grub2Config} \
    455     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    456     ${INITRD} \
    457     ${kernargs:+--args="${kernargs}"} \
    458     ${removeargs:+--remove-args="${removeargs}"}
    459     else
    460     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    461     fi
    462    
    463     if [[ -n ${cfgGrub2Efi} ]]
    464     then
    465     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    466     ${grubby} --grub2 -c ${grub2EfiConfig} \
    467     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    468     ${INITRD} \
    469     ${kernargs:+--args="${kernargs}"} \
    470     ${removeargs:+--remove-args="${removeargs}"}
    471     else
    472     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    473     fi
    474    
    475   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    476   then   then
    477   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    478   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \
    479     ${INITRD} \
    480   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    481   ${removeargs:+--remove-args="${removeargs}"} \   ${removeargs:+--remove-args="${removeargs}"} \
    482   --${liloFlag}   --${liloFlag}
    # Line 268  update() Line 494  update()
    494   else   else
    495   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    496   fi   fi
    497    
    498     if [[ -n ${cfguBoot} ]]
    499     then
    500     [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."
    501    
    502     [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    503     mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 \
    504     -n ${version} -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}
    505    
    506     [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    507     mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \
    508     -n initramfs -d ${initrdfile} ${ubootDir}/uInitrd-${version}
    509    
    510     if [ -f ${ubootDir}/uImage-${version} ] && [ -f ${ubootDir}/uInitrd-${version} ]
    511     then
    512     cp -fp ${ubootDir}/uImage-${version} ${ubootDir}/${ubootDefaultImage}
    513     if [ $? -ne 0 ]
    514     then
    515     [[ -n ${verbose} ]] && echo "copy uImage-${version} error, kernel not installed!" && exit
    516     fi
    517     cp -fp ${ubootDir}/uInitrd-${version} ${ubootDir}/${ubootDefaultInitrd}
    518     if [ $? -ne 0 ]
    519     then
    520     [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    521     fi
    522     echo ${version} >> ${ubootDir}/${ubootKList}
    523     else
    524     [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    525     fi
    526     else
    527     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"
    528     fi
    529    
    530     if [[ -n ${cfgExtlinux} ]]
    531     then
    532     [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    533     ${grubby} --extlinux -c ${extlinuxConfig} \
    534     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    535     ${INITRD} \
    536     ${kernargs:+--args="${kernargs}"} \
    537     ${removeargs:+--remove-args="${removeargs}"}
    538     else
    539     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    540     fi
    541  }  }
    542    
    543  mkinitrd()  mkinitrd()
    544  {  {
    545     if [[ -n ${dracut} ]]
    546     then
    547     tool="dracut ${dracuthostonly} -f ${initrdfile} ${version}"
    548     else
    549     tool="/sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}"
    550     fi
    551   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"
    552   /sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}   ${tool}
    553   rc=$?   rc=$?
    554   if [ ${rc} != 0 ]   if [ ${rc} != 0 ]
    555   then   then
    # Line 312  do Line 588  do
    588   initrd="remove"   initrd="remove"
    589   ;;   ;;
    590    
    591     --dracut)
    592     dracut=--dracut
    593     ;;
    594    
    595     --host-only)
    596     dracuthostonly=-H
    597     ;;
    598    
    599   --initrdfile*)   --initrdfile*)
    600   if echo $1 | grep '=' >/dev/null   if echo $1 | grep '=' >/dev/null
    601   then   then
    # Line 335  do Line 619  do
    619   --remove-args*)   --remove-args*)
    620   if echo $1 | grep '=' >/dev/null   if echo $1 | grep '=' >/dev/null
    621   then   then
    622   removeargs=$(echo $1 | sed 's/^--remove-args=//')   removeargs=$(echo $1 | sed 's/^--remove-args=//')
    623   else   else
    624   removeargs=$2   removeargs=$2
    625   shift   shift
    # Line 395  do Line 679  do
    679   fi   fi
    680   ;;   ;;
    681    
    682     --add-dracut-args)
    683     adddracutargs=--add-dracut-args
    684     ;;
    685    
    686     --add-plymouth-initrd)
    687     addplymouthinitrd=--add-plymouth-initrd
    688     ;;
    689    
    690   -v)   -v)
    691   verbose=-v   verbose=-v
    692   ;;   ;;
    # Line 433  fi Line 725  fi
    725    
    726  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)
    727    
    728  # kernel image for 2.4 is vmlinux  # kernel image for 2.4 is kernel
    729  if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]  if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
    730  then  then
    731   if [[ ${kernelmajor} = 2.4 ]]   if [[ ${kernelmajor} = 2.4 ]]
    # Line 446  fi Line 738  fi
    738  if [[ -z ${initrdfile} ]]  if [[ -z ${initrdfile} ]]
    739  then  then
    740   INITRD_NAME_PREFIX="initrd"   INITRD_NAME_PREFIX="initrd"
    741     if [[ -n ${dracut} ]]
    742     then
    743     INITRD_NAME_PREFIX="initramfs"
    744     fi
    745    
    746   if [[ $(uname -m) = ia64 ]]   if [[ $(uname -m) = ia64 ]]
    747   then   then
    # Line 456  then Line 752  then
    752  fi  fi
    753  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
    754    
    755    # add dracut i18n, keyboard and plymouth kernel args if requested
    756    if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    757    then
    758     [ -r /etc/conf.d/keymap ] && . /etc/conf.d/keymap
    759     [ -r /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont
    760    
    761     if [[ -n ${KEYMAP} ]]
    762     then
    763     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    764     fi
    765    
    766     if [[ -n ${CONSOLEFONT} ]]
    767     then
    768     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    769     fi
    770    fi
    771    
    772  # 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
    773  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&
    774   [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]   [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]
    # Line 487  then Line 800  then
    800  fi  fi
    801    
    802  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    803    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    804    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    805  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    806    [[ -n ${extlinuxConfig} ]] && [ -f ${extlinuxConfig} ] && cfgExtlinux=1
    807    
    808    # if we have a uBoot directory, check if it is mounted.
    809    # if not, mount it. Then check if a boot script exists.
    810    if [[ -n ${ubootDir} ]]
    811    then
    812     mountEntry=$(mount | grep ${ubootDir})
    813     if [[ -z ${mountEntry} ]]
    814     then
    815     mount ${ubootDevice} ${ubootDir}
    816     mounted=1
    817     fi
    818     [ -f ${ubootScript} ] && cfguBoot=1
    819    fi
    820    
    821  # 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
    822  # is lilo to determine if it should be run  # is lilo to determine if it should be run
    Legend:
    Removed from v.925  
    changed lines
      Added in v.1728