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 924 by niro, Wed Oct 28 13:26:45 2009 UTC trunk/grubby/new-kernel-pkg revision 1757 by niro, Sat Feb 18 11:57:40 2012 UTC
    # Line 39  else Line 39  else
    39   grubby=/sbin/grubby   grubby=/sbin/grubby
    40  fi  fi
    41    
    42  [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel  [ -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 ]] || [[ ${ARCH} = armv7hl ]]
    89    then
    90     machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
    91     liloConfig=""
    92     bootPrefix=/boot
    93     ubootDir=${UBOOT_DIR:-"/boot/uboot"}
    94     ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    95     ubootKList=${UBOOT_KLIST:-"klist.txt"}
    96     ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
    97     ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}
    98     ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}
    99     mounted=""
    100     liloFlag=""
    101     isx86=""
    102     if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]
    103     then
    104     ubootAddress=0x80008000
    105     else
    106     ubootAddress=0x00008000
    107     fi
    108  else  else
    109   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    110   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    111   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    112     grub2Config=/boot/grub/grub.cfg
    113     grub2EfiConfig=/boot/grub/grub-efi.cfg
    114     extlinuxConfig=/boot/extlinux/extlinux.conf
    115   bootPrefix=/boot   bootPrefix=/boot
    116   liloFlag=lilo   liloFlag=lilo
    117   isx86="yes"   isx86="yes"
    # Line 89  fi Line 120  fi
    120  mode=""  mode=""
    121  version=""  version=""
    122  initrd=""  initrd=""
    123    dracut=""
    124    dracuthostonly=""
    125  initrdfile=""  initrdfile=""
    126  moddep=""  moddep=""
    127  verbose=""  verbose=""
    128  makedefault=""  makedefault=""
    129  package=""  package=""
    130  mbkernel=""  mbkernel="${HYPERVISOR}"
    131  mbargs=""  mbargs="${HYPERVISOR_ARGS}"
    132    adddracutargs=""
    133    addplymouthinitrd=""
    134    
    135  usage()  usage()
    136  {  {
    137   echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd]" >&2   echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd] [--dracut]" >&2
    138   echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2   echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
    139   echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2   echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2
    140   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
    141   echo "       [--mbargs=mbargs] [--make-default]" >&2   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
    142     echo "       [--add-plymouth-initrd]" >&2
    143     echo "       [--host-only]" >&2
    144   echo "       <--install | --remove | --update> <kernel-version>" >&2   echo "       <--install | --remove | --update> <kernel-version>" >&2
    145   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
    146   exit 1   exit 1
    # Line 123  install() Line 160  install()
    160   then   then
    161   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
    162   INITRD="--initrd ${initrdfile}"   INITRD="--initrd ${initrdfile}"
    163    
    164     if [[ -n ${addplymouthinitrd} ]]
    165     then
    166     INITRD="${INITRD} --extra-initrd ${bootPrefix}/initrd-plymouth.img"
    167     fi
    168   fi   fi
    169    
    170   # 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 156  install() Line 198  install()
    198    
    199   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    200   then   then
    201   title="${banner} (${version})"   title="${banner} [ ${version} ]"
    202   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    203   then   then
    204   title="Magellan Linux $(< /etc/mageversion) (${version})"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    205   else   else
    206   title="Magellan Linux (${version})"   title="Magellan Linux [ ${version} ]"
    207   fi   fi
    208   ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    209     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    210   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    211   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    212   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    213   else   else
    214   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    215     fi
    216     if [[ -n ${cfgGrub2} ]]
    217     then
    218     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    219    
    220     if [[ -n ${banner} ]]
    221     then
    222     title="${banner} [ ${version} ]"
    223     elif [ -f /etc/mageversion ]
    224     then
    225     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    226     else
    227     title="Magellan Linux [ ${version} ]"
    228     fi
    229     ${grubby} --grub2 -c ${grub2Config} \
    230     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    231     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    232     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    233     ${mbargs:+--mbargs="${mbargs}"} \
    234     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    235     else
    236     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    237     fi
    238     if [[ -n ${cfgGrub2Efi} ]]
    239     then
    240     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    241    
    242     if [[ -n ${banner} ]]
    243     then
    244     title="${banner} [ ${version} ]"
    245     elif [ -f /etc/mageversion ]
    246     then
    247     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    248     else
    249     title="Magellan Linux [ ${version} ]"
    250     fi
    251     ${grubby} --grub2 -c ${grub2EfiConfig} \
    252     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    253     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    254     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    255     ${mbargs:+--mbargs="${mbargs}"} \
    256     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    257     else
    258     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    259   fi   fi
    260    
    261   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 184  install() Line 271  install()
    271   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    272   then   then
    273   [[ -n ${verbose} ]] && echo "running ${lilo}"   [[ -n ${verbose} ]] && echo "running ${lilo}"
    274   if [ ! -x $lilo ]   if [ ! -x ${lilo} ]
    275   then   then
    276   [[ -n ${verbose} ]] && echo "${lilo} does not exist"   [[ -n ${verbose} ]] && echo "${lilo} does not exist"
    277   else   else
    # Line 194  install() Line 281  install()
    281   else   else
    282   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    283   fi   fi
    284    
    285     if [[ -n ${cfgExtlinux} ]]
    286     then
    287     [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    288    
    289     if [[ -n ${banner} ]]
    290     then
    291     title="${banner} [ ${version} ]"
    292     elif [ -f /etc/mageversion ]
    293     then
    294     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    295     else
    296     title="Magellan Linux [ ${version} ]"
    297     fi
    298     ${grubby} --extlinux -c ${extlinuxConfig} \
    299     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    300     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    301     ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    302     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    303     else
    304     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    305     fi
    306  }  }
    307    
    308  remove()  remove()
    # Line 209  remove() Line 318  remove()
    318   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    319   then   then
    320   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    321   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub -c ${grubConfig} \
    322     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    323   else   else
    324   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    325     fi
    326     if [[ -n ${cfgGrub2} ]]
    327     then
    328     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    329     ${grubby} --grub2 -c ${grub2Config} \
    330     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    331     else
    332     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    333     fi
    334     if [[ -n ${cfgGrub2Efi} ]]
    335     then
    336     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    337     ${grubby} --grub2 -c ${grub2EfiConfig} \
    338     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    339     else
    340     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    341   fi   fi
    342    
    343   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    344   then   then
    345   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"
    346   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}    \   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version} --${liloFlag}
      --${liloFlag}  
    347    
    348   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    349   then   then
    # Line 233  remove() Line 358  remove()
    358   else   else
    359   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    360   fi   fi
    361    
    362     if [[ -n ${cfguBoot} ]]
    363     then
    364     [[ -n ${verbose} ]] && echo "removing ${version} from ${ubootDir}..."
    365    
    366     if [ -f ${ubootDir}/${ubootKList} ]
    367     then
    368     tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
    369     curversion=$(tail -n1 ${ubootDir}/${ubootKList})
    370     sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList}
    371     newversion=$(tail -n1 ${tmpKList})
    372     if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
    373     then
    374     if [[ ${curversion} != ${newversion} ]]
    375     then
    376     cp -fp ${ubootDir}/uImage-${newversion} ${ubootDir}/${ubootDefaultImage}
    377     if [ $? -ne 0 ]
    378     then
    379     [[ -n ${verbose} ]] && echo "copy uImage-${newversion} error, default kernel not replaced!" && exit
    380     fi
    381     cp -fp ${ubootDir}/uInitrd-${newversion} ${ubootDir}/${ubootDefaultInitrd}
    382     if [ $? -ne 0 ]
    383     then
    384     [[ -n ${verbose} ]] && echo "copy uInitrd-${newversion} error, default Initrd not replaced!" && exit
    385     fi
    386     fi
    387    
    388     [[ -n ${verbose} ]] && echo "removing uImage-${version}"
    389     if [ -f ${ubootDir}/uImage-${version} ]
    390     then
    391     rm -f ${ubootDir}/uImage-${version}
    392     else
    393     [[ -n ${verbose} ]] && echo "uImage-${version} did not exist!"
    394     fi
    395    
    396     [[ -n ${verbose} ]] && echo "removing uInitrd-${version}"
    397     if [ -f ${ubootDir}/uInitrd-${version} ]
    398     then
    399     rm -f ${ubootDir}/uInitrd-${version}
    400     else
    401     [[ -n ${verbose} ]] && echo "uInitrd-${version} did not exist!"
    402     fi
    403    
    404     mv ${tmpKList} ${ubootDir}/${ubootKList}
    405     else
    406     [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    407     [ -f ${tmpKList} ] && rm -f ${tmpKList}
    408     fi
    409     else
    410     [[ -n ${verbose} ]] && echo "No previous kernel version.  U-Boot images not removed!"
    411     fi
    412     else
    413     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"
    414     fi
    415    
    416     if [[ -n ${cfgExtlinux} ]]
    417     then
    418     [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    419     ${grubby} --extlinux -c ${extlinuxConfig} \
    420     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    421     else
    422     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    423     fi
    424  }  }
    425    
    426  update()  update()
    427  {  {
    428     if [ ! -f ${bootPrefix}/${kernelName}-${version} ]
    429     then
    430     [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
    431     return
    432     fi
    433    
    434     INITRD=""
    435     if [ -f ${initrdfile} ]
    436     then
    437     [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
    438     INITRD="--initrd ${initrdfile}"
    439    
    440     if [[ -n ${addplymouthinitrd} ]]
    441     then
    442     INITRD="${INITRD} --extra-initrd ${bootPrefix}/initrd-plymouth.img"
    443     fi
    444     fi
    445    
    446   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    447   then   then
    448   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    449   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    450     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    451     ${INITRD} \
    452   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    453   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    454   else   else
    455   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    456   fi   fi
    457    
    458     if [[ -n ${cfgGrub2} ]]
    459     then
    460     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    461     ${grubby} --grub2 -c ${grub2Config} \
    462     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    463     ${INITRD} \
    464     ${kernargs:+--args="${kernargs}"} \
    465     ${removeargs:+--remove-args="${removeargs}"}
    466     else
    467     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    468     fi
    469    
    470     if [[ -n ${cfgGrub2Efi} ]]
    471     then
    472     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    473     ${grubby} --grub2 -c ${grub2EfiConfig} \
    474     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    475     ${INITRD} \
    476     ${kernargs:+--args="${kernargs}"} \
    477     ${removeargs:+--remove-args="${removeargs}"}
    478     else
    479     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    480     fi
    481    
    482   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    483   then   then
    484   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    485   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \
    486     ${INITRD} \
    487   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    488   ${removeargs:+--remove-args="${removeargs}"} \   ${removeargs:+--remove-args="${removeargs}"} \
    489   --${liloFlag}   --${liloFlag}
    # Line 268  update() Line 501  update()
    501   else   else
    502   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    503   fi   fi
    504    
    505     if [[ -n ${cfguBoot} ]]
    506     then
    507     [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."
    508    
    509     [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    510     mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
    511     -e ${ubootAddress} -n ${version} \
    512     -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}
    513    
    514     [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    515     mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \
    516     -n initramfs -d ${initrdfile} ${ubootDir}/uInitrd-${version}
    517    
    518     if [ -f ${ubootDir}/uImage-${version} ] && [ -f ${ubootDir}/uInitrd-${version} ]
    519     then
    520     cp -fp ${ubootDir}/uImage-${version} ${ubootDir}/${ubootDefaultImage}
    521     if [ $? -ne 0 ]
    522     then
    523     [[ -n ${verbose} ]] && echo "copy uImage-${version} error, kernel not installed!" && exit
    524     fi
    525     cp -fp ${ubootDir}/uInitrd-${version} ${ubootDir}/${ubootDefaultInitrd}
    526     if [ $? -ne 0 ]
    527     then
    528     [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    529     fi
    530     echo ${version} >> ${ubootDir}/${ubootKList}
    531     else
    532     [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    533     fi
    534     else
    535     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"
    536     fi
    537    
    538     if [[ -n ${cfgExtlinux} ]]
    539     then
    540     [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    541     ${grubby} --extlinux -c ${extlinuxConfig} \
    542     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    543     ${INITRD} \
    544     ${kernargs:+--args="${kernargs}"} \
    545     ${removeargs:+--remove-args="${removeargs}"}
    546     else
    547     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    548     fi
    549  }  }
    550    
    551  mkinitrd()  makeinitrd()
    552  {  {
    553     if [[ -n ${dracut} ]]
    554     then
    555     tool="dracut ${dracuthostonly} -f ${initrdfile} ${version}"
    556     else
    557     tool="mkinitrd --allow-missing -f ${initrdfile} ${version}"
    558     fi
    559   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"
    560   /sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}   ${tool}
    561   rc=$?   rc=$?
    562   if [ ${rc} != 0 ]   if [ ${rc} != 0 ]
    563   then   then
    # Line 312  do Line 596  do
    596   initrd="remove"   initrd="remove"
    597   ;;   ;;
    598    
    599     --dracut)
    600     dracut=--dracut
    601     ;;
    602    
    603     --host-only)
    604     dracuthostonly=-H
    605     ;;
    606    
    607   --initrdfile*)   --initrdfile*)
    608   if echo $1 | grep '=' >/dev/null   if echo $1 | grep '=' >/dev/null
    609   then   then
    # Line 335  do Line 627  do
    627   --remove-args*)   --remove-args*)
    628   if echo $1 | grep '=' >/dev/null   if echo $1 | grep '=' >/dev/null
    629   then   then
    630   removeargs=$(echo $1 | sed 's/^--remove-args=//')   removeargs=$(echo $1 | sed 's/^--remove-args=//')
    631   else   else
    632   removeargs=$2   removeargs=$2
    633   shift   shift
    # Line 395  do Line 687  do
    687   fi   fi
    688   ;;   ;;
    689    
    690     --add-dracut-args)
    691     adddracutargs=--add-dracut-args
    692     ;;
    693    
    694     --add-plymouth-initrd)
    695     addplymouthinitrd=--add-plymouth-initrd
    696     ;;
    697    
    698   -v)   -v)
    699   verbose=-v   verbose=-v
    700   ;;   ;;
    # Line 433  fi Line 733  fi
    733    
    734  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)  kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)
    735    
    736  # kernel image for 2.4 is vmlinux  # kernel image for 2.4 is kernel
    737  if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]  if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
    738  then  then
    739   if [[ ${kernelmajor} = 2.4 ]]   if [[ ${kernelmajor} = 2.4 ]]
    # Line 446  fi Line 746  fi
    746  if [[ -z ${initrdfile} ]]  if [[ -z ${initrdfile} ]]
    747  then  then
    748   INITRD_NAME_PREFIX="initrd"   INITRD_NAME_PREFIX="initrd"
    749     if [[ -n ${dracut} ]]
    750     then
    751     INITRD_NAME_PREFIX="initramfs"
    752     fi
    753    
    754   if [[ $(uname -m) = ia64 ]]   if [[ $(uname -m) = ia64 ]]
    755   then   then
    # Line 456  then Line 760  then
    760  fi  fi
    761  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
    762    
    763    # add dracut i18n, keyboard and plymouth kernel args if requested
    764    if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    765    then
    766     [ -r /etc/conf.d/keymap ] && . /etc/conf.d/keymap
    767     [ -r /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont
    768    
    769     if [[ -n ${KEYMAP} ]]
    770     then
    771     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    772     fi
    773    
    774     if [[ -n ${CONSOLEFONT} ]]
    775     then
    776     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    777     fi
    778    fi
    779    
    780  # 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
    781  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&
    782   [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]   [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]
    # Line 474  fi Line 795  fi
    795    
    796  if [[ ${initrd} = make ]]  if [[ ${initrd} = make ]]
    797  then  then
    798   mkinitrd   makeinitrd
    799  elif [[ ${initrd} = remove ]]  elif [[ ${initrd} = remove ]]
    800  then  then
    801   rminitrd   rminitrd
    # Line 487  then Line 808  then
    808  fi  fi
    809    
    810  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    811    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    812    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    813  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    814    [[ -n ${extlinuxConfig} ]] && [ -f ${extlinuxConfig} ] && cfgExtlinux=1
    815    
    816    # if we have a U-Boot directory, but no boot script, check if the directory
    817    # is mounted.  If not, mount it, and then check if a boot script exists.
    818    if [[ -n ${ubootDir} ]]
    819    then
    820     if [ -f ${ubootScript} ]
    821     then
    822     cfguBoot=1
    823     else
    824     mountEntry=$(mount | grep ${ubootDir})
    825     if [[ -z ${mountEntry} ]]
    826     then
    827     mount ${ubootDevice} ${ubootDir}
    828     mounted=1
    829     fi
    830     [ -f ${ubootScript} ] && cfguBoot=1
    831     fi
    832    fi
    833    
    834  # 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
    835  # is lilo to determine if it should be run  # is lilo to determine if it should be run
    # Line 507  then Line 849  then
    849   update   update
    850  fi  fi
    851    
    852    # if we mounted the U-Boot directory, unmount it.
    853    [[ -n ${mounted} ]] && umount ${ubootDir}
    854    
    855  exit 0  exit 0
    Legend:
    Removed from v.924  
    changed lines
      Added in v.1757