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

    revision 1332 by niro, Fri Jun 3 20:32:19 2011 UTC revision 2244 by niro, Mon Oct 21 13:52:07 2013 UTC
    # Line 25  Line 25 
    25  # along with this program.  If not, see <http://www.gnu.org/licenses/>.  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    26  #  #
    27    
    28    read_os_release()
    29    {
    30     local NAME
    31     local ID
    32     local Version
    33     local Version_ID
    34     local PRETTY_NAME
    35     local ANSI_COLOR
    36     local CPE_NAME
    37    
    38     if [[ -f /etc/os-release ]]
    39     then
    40     source /etc/os-release
    41    
    42     case $1 in
    43     name) echo "${NAME}" ;;
    44     id) echo "${ID}" ;;
    45     version) echo "${Version}" ;;
    46     version_id) echo "${Version_ID}" ;;
    47     pretty_name) echo "${PRETTY_NAME}" ;;
    48     ansi_color) echo "${ANSI_COLOR}" ;;
    49     cpe_name) echo "${CPE_NAME}" ;;
    50     esac
    51     fi
    52    }
    53    
    54  PATH=/sbin:/bin:$PATH  PATH=/sbin:/bin:$PATH
    55    
    56  lilo=/sbin/lilo  lilo=/sbin/lilo
    # Line 40  else Line 66  else
    66  fi  fi
    67    
    68  [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby  [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby
    69    [ -f /etc/conf.d/grubby-uboot ] && . /etc/conf.d/grubby-uboot
    70    
    71    cfgGrub2=""
    72    cfgGrub2Efi=""
    73  cfgGrub=""  cfgGrub=""
    74  cfgLilo=""  cfgLilo=""
    75    cfgExtlinux=""
    76    cfguBoot=""
    77  runLilo=""  runLilo=""
    78  grubConfig=""  grubConfig=""
    79    grub2Config=""
    80    grub2EfiConfig=""
    81    extlinuxConfig=""
    82    
    83  ARCH=$(uname -m)  ARCH=$(uname -m)
    84    
    # Line 57  then Line 91  then
    91  elif [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]  elif [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
    92  then  then
    93   liloConfig=/etc/yaboot.conf   liloConfig=/etc/yaboot.conf
    94     grub2Config=/boot/grub/grub.cfg
    95   bootPrefix=/boot   bootPrefix=/boot
    96   lilo=/sbin/ybin   lilo=/sbin/ybin
    97   liloFlag=yaboot   liloFlag=yaboot
    # Line 77  then Line 112  then
    112   lilo=/sbin/zipl   lilo=/sbin/zipl
    113   runLilo="yes"   runLilo="yes"
    114   isx86=""   isx86=""
    115    elif [[ ${ARCH} =~ armv[5|7].*l ]]
    116    then
    117     liloConfig=""
    118     bootPrefix=/boot
    119     ubootDir=${UBOOT_DIR:-"/boot"}
    120     ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    121     ubootKList=${UBOOT_KLIST:-"klist.txt"}
    122     ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
    123     ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}
    124     ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}
    125     ubootAddress=${UBOOT_IMGADDR:-"0x00008000"}
    126     mounted=""
    127     liloFlag=""
    128     isx86=""
    129  else  else
    130   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    131   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    132   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    133     grub2Config=/boot/grub/grub.cfg
    134     grub2EfiConfig=/boot/grub/grub-efi.cfg
    135     extlinuxConfig=/boot/extlinux/extlinux.conf
    136   bootPrefix=/boot   bootPrefix=/boot
    137   liloFlag=lilo   liloFlag=lilo
    138   isx86="yes"   isx86="yes"
    # Line 89  fi Line 141  fi
    141  mode=""  mode=""
    142  version=""  version=""
    143  initrd=""  initrd=""
    144    dracut=""
    145    dracuthostonly=""
    146  initrdfile=""  initrdfile=""
    147  moddep=""  moddep=""
    148  verbose=""  verbose=""
    149  makedefault=""  makedefault=""
    150  package=""  package=""
    151  mbkernel=""  mbkernel="${HYPERVISOR}"
    152  mbargs=""  mbargs="${HYPERVISOR_ARGS}"
    153    adddracutargs=""
    154    addplymouthinitrd=""
    155    
    156  usage()  usage()
    157  {  {
    158   echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd]" >&2   echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd] [--dracut]" >&2
    159   echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2   echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
    160   echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2   echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2
    161   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
    162   echo "       [--mbargs=mbargs] [--make-default]" >&2   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
    163     echo "       [--add-plymouth-initrd]" >&2
    164     echo "       [--host-only]" >&2
    165   echo "       <--install | --remove | --update> <kernel-version>" >&2   echo "       <--install | --remove | --update> <kernel-version>" >&2
    166   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
    167   exit 1   exit 1
    168  }  }
    169    
     run_grub2()  
     {  
      if [ -d /boot/grub2 -a -x /sbin/grub2-mkconfig ]  
      then  
      cp /boot/grub2/grub.cfg /boot/grub2/grub.cfg.old  
      /sbin/grub2-mkconfig -o /boot/grub2/grub.cfg  
      fi  
     }  
       
    170  install()  install()
    171  {  {
    172   # XXX kernel should be able to be specified also (or work right on ia64)   # XXX kernel should be able to be specified also (or work right on ia64)
    173   if [ ! -f ${bootPrefix}/${kernelName}-${version} ]   if [ ! -f ${kernelImage} ]
    174   then   then
    175   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
    176   return   return
    # Line 132  install() Line 181  install()
    181   then   then
    182   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
    183   INITRD="--initrd ${initrdfile}"   INITRD="--initrd ${initrdfile}"
    184    
    185     if [[ -n ${addplymouthinitrd} ]]
    186     then
    187     INITRD="${INITRD} --extra-initrd ${bootPrefix}/initrd-plymouth.img"
    188     fi
    189   fi   fi
    190    
    191   # 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 141  install() Line 195  install()
    195   if [[ -z ${initrdfile} ]]   if [[ -z ${initrdfile} ]]
    196   then   then
    197   [[ -n ${verbose} ]] && echo "No initrd, just adding system map"   [[ -n ${verbose} ]] && echo "No initrd, just adding system map"
    198   /sbin/addSystemMap ${bootPrefix}/System.map-${version} ${bootPrefix}/${kernelName}-${version} ${bootPrefix}/vmlinitrd-${version}   /sbin/addSystemMap ${bootPrefix}/System.map-${version} ${kernelImage} ${bootPrefix}/vmlinitrd-${version}
    199   else   else
    200   /sbin/addSystemMap ${bootPrefix}/System.map-${version} ${bootPrefix}/${kernelName}-${version} ${bootPrefix}/vmlinux.sm-${version}   /sbin/addSystemMap ${bootPrefix}/System.map-${version} ${kernelImage} ${bootPrefix}/vmlinux.sm-${version}
    201   /sbin/addRamDisk ${initrdfile} ${bootPrefix}/System.map-${version} ${bootPrefix}/vmlinux.sm-${version} ${bootPrefix}/vmlinitrd-${version} 2>/dev/null   /sbin/addRamDisk ${initrdfile} ${bootPrefix}/System.map-${version} ${bootPrefix}/vmlinux.sm-${version} ${bootPrefix}/vmlinitrd-${version} 2>/dev/null
    202   rm ${bootPrefix}/vmlinux.sm-${version}   rm ${bootPrefix}/vmlinux.sm-${version}
    203   fi   fi
    204   return   return
    205   fi   fi
    206    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    207   # get the root filesystem to use   # get the root filesystem to use
    208   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab  2>/dev/null)
    209     if [[ -z $rootdevice ]]
    210     then
    211     rootdevice=$(grep -o -P "(?<=root=)\S+" /proc/cmdline)
    212     fi
    213    
    214   if [[ -n ${mbkernel} ]] && [[ -n ${cfgLilo} ]] && [[ ${liloFlag} != elilo ]]   if [[ -n ${mbkernel} ]] && [[ -n ${cfgLilo} ]] && [[ ${liloFlag} != elilo ]]
    215   then   then
    # Line 162  install() Line 217  install()
    217   cfgLilo=""   cfgLilo=""
    218   fi   fi
    219    
    220     if [[ -n ${banner} ]]
    221     then
    222     title="${banner} [ ${version} ]"
    223     elif [[ $(read_os_release id) = magellan ]]
    224     then
    225     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    226     elif [ -f /etc/mageversion ]
    227     then
    228     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    229     else
    230     title="Magellan Linux [ ${version} ]"
    231     fi
    232    
    233   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    234   then   then
    235   [[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"
    236    
    237   if [[ -n ${banner} ]]   ${grubby} --grub -c ${grubConfig} \
    238   then   --add-kernel=${kernelImage} \
      title="${banner} (${version})"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) (${version})"  
      else  
      title="Magellan Linux (${version})"  
      fi  
      ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} \  
    239   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    240   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    241   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    242   else   else
    243   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    244     fi
    245     if [[ -n ${cfgGrub2} ]]
    246     then
    247     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    248    
    249     ${grubby} --grub2 -c ${grub2Config} \
    250     --add-kernel=${kernelImage} \
    251     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    252     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    253     ${mbargs:+--mbargs="${mbargs}"} \
    254     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    255     else
    256     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    257     fi
    258     if [[ -n ${cfgGrub2Efi} ]]
    259     then
    260     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    261    
    262     ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    263     --add-kernel=${kernelImage} \
    264     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    265     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    266     ${mbargs:+--mbargs="${mbargs}"} \
    267     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    268     else
    269     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    270   fi   fi
    271    
    272   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    273   then   then
    274   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
    275    
    276   ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} ${INITRD} \   ${grubby} --add-kernel=${kernelImage} ${INITRD} \
    277   --copy-default ${makedefault} --title ${version} \   --copy-default ${makedefault} --title ${version} \
    278   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    279   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \
    # Line 206  install() Line 292  install()
    292   else   else
    293   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    294   fi   fi
    295    
    296     if [[ -n ${cfgExtlinux} ]]
    297     then
    298     [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    299    
    300     ${grubby} --extlinux -c ${extlinuxConfig} \
    301     --add-kernel=${kernelImage} \
    302     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    303     ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    304     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    305     else
    306     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    307     fi
    308  }  }
    309    
    310  remove()  remove()
    # Line 214  remove() Line 313  remove()
    313   if [ -d /proc/iSeries ]   if [ -d /proc/iSeries ]
    314   then   then
    315   [[ -n ${verbose} ]] && echo "On an iSeries, remove img file"   [[ -n ${verbose} ]] && echo "On an iSeries, remove img file"
    316   rm -f ${bootPrefix}/${kernelName}-${version}.img 2>/dev/null   rm -f ${kernelImage}.img 2>/dev/null
    317   return   return
    318   fi   fi
    319    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    320   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    321   then   then
    322   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    323   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub -c ${grubConfig} \
    324     --remove-kernel=${kernelImage}
    325   else   else
    326   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    327     fi
    328     if [[ -n ${cfgGrub2} ]]
    329     then
    330     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    331     ${grubby} --grub2 -c ${grub2Config} \
    332     --remove-kernel=${kernelImage}
    333     else
    334     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    335     fi
    336     if [[ -n ${cfgGrub2Efi} ]]
    337     then
    338     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    339     ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    340     --remove-kernel=${kernelImage}
    341     else
    342     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    343   fi   fi
    344    
    345   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    346   then   then
    347   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"
    348   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version} --${liloFlag}   ${grubby} --remove-kernel=${kernelImage} --${liloFlag}
    349    
    350   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    351   then   then
    # Line 247  remove() Line 360  remove()
    360   else   else
    361   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    362   fi   fi
    363    
    364     if [[ -n ${cfguBoot} ]]
    365     then
    366     [[ -n ${verbose} ]] && echo "removing ${version} from ${ubootDir}..."
    367    
    368     if [ -f ${ubootDir}/${ubootKList} ]
    369     then
    370     tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
    371     curversion=$(tail -n1 ${ubootDir}/${ubootKList})
    372     sed "/$version$/d" ${ubootDir}/${ubootKList} > ${tmpKList}
    373     newversion=$(tail -n1 ${tmpKList})
    374     if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
    375     then
    376     if [[ ${curversion} != ${newversion} ]]
    377     then
    378     cp -fp ${ubootDir}/uImage-${newversion} ${ubootDir}/${ubootDefaultImage}
    379     if [ $? -ne 0 ]
    380     then
    381     [[ -n ${verbose} ]] && echo "copy uImage-${newversion} error, default kernel not replaced!" && exit
    382     fi
    383     cp -fp ${ubootDir}/uInitrd-${newversion} ${ubootDir}/${ubootDefaultInitrd}
    384     if [ $? -ne 0 ]
    385     then
    386     [[ -n ${verbose} ]] && echo "copy uInitrd-${newversion} error, default Initrd not replaced!" && exit
    387     fi
    388     fi
    389    
    390     [[ -n ${verbose} ]] && echo "removing uImage-${version}"
    391     if [ -f ${ubootDir}/uImage-${version} ]
    392     then
    393     rm -f ${ubootDir}/uImage-${version}
    394     else
    395     [[ -n ${verbose} ]] && echo "uImage-${version} did not exist!"
    396     fi
    397    
    398     [[ -n ${verbose} ]] && echo "removing uInitrd-${version}"
    399     if [ -f ${ubootDir}/uInitrd-${version} ]
    400     then
    401     rm -f ${ubootDir}/uInitrd-${version}
    402     else
    403     [[ -n ${verbose} ]] && echo "uInitrd-${version} did not exist!"
    404     fi
    405    
    406     mv ${tmpKList} ${ubootDir}/${ubootKList}
    407     else
    408     [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    409     [ -f ${tmpKList} ] && rm -f ${tmpKList}
    410     fi
    411     else
    412     [[ -n ${verbose} ]] && echo "No previous kernel version.  U-Boot images not removed!"
    413     fi
    414     else
    415     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"
    416     fi
    417    
    418     if [[ -n ${cfgExtlinux} ]]
    419     then
    420     [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    421     ${grubby} --extlinux -c ${extlinuxConfig} \
    422     --remove-kernel=${kernelImage}
    423     else
    424     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    425     fi
    426  }  }
    427    
    428  update()  update()
    429  {  {
    430   if [ ! -f ${bootPrefix}/${kernelName}-${version} ]   if [ ! -f ${kernelImage} ]
    431   then   then
    432   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
    433   return   return
    # Line 262  update() Line 438  update()
    438   then   then
    439   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"   [[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
    440   INITRD="--initrd ${initrdfile}"   INITRD="--initrd ${initrdfile}"
      fi  
    441    
    442   # Run grub2's configuration update in parallel, if it is installed   if [[ -n ${addplymouthinitrd} ]]
    443   run_grub2   then
    444     INITRD="${INITRD} --extra-initrd ${bootPrefix}/initrd-plymouth.img"
    445     fi
    446     fi
    447    
    448   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    449   then   then
    450   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    451   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    452     --update-kernel=${kernelImage} \
    453   ${INITRD} \   ${INITRD} \
    454   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    455   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 278  update() Line 457  update()
    457   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    458   fi   fi
    459    
    460     if [[ -n ${cfgGrub2} ]]
    461     then
    462     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    463     ${grubby} --grub2 -c ${grub2Config} \
    464     --update-kernel=${kernelImage} \
    465     ${INITRD} \
    466     ${kernargs:+--args="${kernargs}"} \
    467     ${removeargs:+--remove-args="${removeargs}"}
    468     else
    469     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    470     fi
    471    
    472     if [[ -n ${cfgGrub2Efi} ]]
    473     then
    474     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    475     ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    476     --update-kernel=${kernelImage} \
    477     ${INITRD} \
    478     ${kernargs:+--args="${kernargs}"} \
    479     ${removeargs:+--remove-args="${removeargs}"}
    480     else
    481     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    482     fi
    483    
    484   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    485   then   then
    486   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    487   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --update-kernel=${kernelImage} \
    488   ${INITRD} \   ${INITRD} \
    489   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    490   ${removeargs:+--remove-args="${removeargs}"} \   ${removeargs:+--remove-args="${removeargs}"} \
    # Line 300  update() Line 503  update()
    503   else   else
    504   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    505   fi   fi
    506    
    507     if [[ -n ${cfguBoot} ]]
    508     then
    509     [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."
    510    
    511     [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    512     mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
    513     -e ${ubootAddress} -n ${version} \
    514     -d ${kernelImage} ${ubootDir}/uImage-${version}
    515    
    516     [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    517     mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \
    518     -n initramfs -d ${initrdfile} ${ubootDir}/uInitrd-${version}
    519    
    520     if [ -f ${ubootDir}/uImage-${version} ] && [ -f ${ubootDir}/uInitrd-${version} ]
    521     then
    522     cp -fp ${ubootDir}/uImage-${version} ${ubootDir}/${ubootDefaultImage}
    523     if [ $? -ne 0 ]
    524     then
    525     [[ -n ${verbose} ]] && echo "copy uImage-${version} error, kernel not installed!" && exit
    526     fi
    527     cp -fp ${ubootDir}/uInitrd-${version} ${ubootDir}/${ubootDefaultInitrd}
    528     if [ $? -ne 0 ]
    529     then
    530     [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    531     fi
    532     echo ${version} >> ${ubootDir}/${ubootKList}
    533     else
    534     [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    535     fi
    536     else
    537     [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"
    538     fi
    539    
    540     if [[ -n ${cfgExtlinux} ]]
    541     then
    542     [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    543     ${grubby} --extlinux -c ${extlinuxConfig} \
    544     --update-kernel=${kernelImage} \
    545     ${INITRD} \
    546     ${kernargs:+--args="${kernargs}"} \
    547     ${removeargs:+--remove-args="${removeargs}"}
    548     else
    549     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    550     fi
    551  }  }
    552    
    553  mkinitrd()  makeinitrd()
    554  {  {
    555     if [[ -n ${dracut} ]]
    556     then
    557     tool="dracut ${dracuthostonly} -f ${initrdfile} ${version}"
    558     else
    559     tool="mkinitrd --allow-missing -f ${initrdfile} ${version}"
    560     fi
    561   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"
    562   /sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}   ${tool}
    563   rc=$?   rc=$?
    564   if [ ${rc} != 0 ]   if [ ${rc} != 0 ]
    565   then   then
    # Line 329  doDepmod() Line 583  doDepmod()
    583  doRmmoddep()  doRmmoddep()
    584  {  {
    585   [[ -n ${verbose} ]] && echo "removing modules.dep info for ${version}"   [[ -n ${verbose} ]] && echo "removing modules.dep info for ${version}"
    586   [ -d /lib/modules/${version} ] && rm -f /lib/modules/${version}/modules.*   if [ -d /lib/modules/${version} ]
    587     then
    588     rm -f /lib/modules/${version}/modules.*.bin \
    589     /lib/modules/${version}/modules.{alias,dep,devname,symbols,softdep}
    590     fi
    591  }  }
    592    
    593    
    # Line 344  do Line 602  do
    602   initrd="remove"   initrd="remove"
    603   ;;   ;;
    604    
    605     --dracut)
    606     dracut=--dracut
    607     ;;
    608    
    609     --host-only)
    610     dracuthostonly=-H
    611     ;;
    612    
    613   --initrdfile*)   --initrdfile*)
    614   if echo $1 | grep '=' >/dev/null   if [[ $1 == --initrdfile\=* ]]
    615   then   then
    616   initrdfile=$(echo $1 | sed 's/^--initrdfile=//')   initrdfile=${1#--initrdfile=}
    617   else   else
    618   initrdfile=$2   initrdfile=$2
    619   shift   shift
    # Line 355  do Line 621  do
    621   ;;   ;;
    622    
    623   --kernel-args*)   --kernel-args*)
    624   if echo $1 | grep '=' >/dev/null   if [[ $1 == --kernel-args\=* ]]
    625   then   then
    626   kernargs=$(echo $1 | sed 's/^--kernel-args=//')   kernargs=${1#--kernel-args=}
    627   else   else
    628   kernargs=$2   kernargs=$2
    629   shift   shift
    # Line 365  do Line 631  do
    631   ;;   ;;
    632    
    633   --remove-args*)   --remove-args*)
    634   if echo $1 | grep '=' >/dev/null   if [[ $1 == --remove-args\=* ]]
    635   then   then
    636   removeargs=$(echo $1 | sed 's/^--remove-args=//')   removeargs=${1#--remove-args=}
    637   else   else
    638   removeargs=$2   removeargs=$2
    639   shift   shift
    # Line 375  do Line 641  do
    641   ;;   ;;
    642    
    643   --banner*)   --banner*)
    644   if echo $1 | grep '=' >/dev/null   if [[ $1 == --banner\=* ]]
    645   then   then
    646   banner=$(echo $1 | sed 's/^--banner=//')   banner=${1#--banner=}
    647   else   else
    648   banner=$2   banner=$2
    649   shift   shift
    # Line 385  do Line 651  do
    651   ;;   ;;
    652    
    653   --multiboot*)   --multiboot*)
    654   if echo $1 |grep '=' >/dev/null   if [[ $1 == --multiboot\=* ]]
    655   then   then
    656   mbkernel=$(echo $1 | sed 's/^--multiboot=//')   mbkernel=${1#--multiboot=}
    657   else   else
    658   # can't really support having an optional second arg here   # can't really support having an optional second arg here
    659   # sorry!   # sorry!
    # Line 396  do Line 662  do
    662   ;;   ;;
    663    
    664   --mbargs*)   --mbargs*)
    665   if echo $1 |grep '=' >/dev/null   if [[ $1 == --mbargs\=* ]]
    666   then   then
    667   mbargs=$(echo $1 | sed 's/^--mbargs=//')   mbargs=${1#--mbargs=}
    668   else   else
    669   mbargs="$2"   mbargs="$2"
    670   shift   shift
    # Line 417  do Line 683  do
    683   makedefault="--make-default"   makedefault="--make-default"
    684   ;;   ;;
    685    
    686   --package)   --package*)
    687   if echo $1 | grep '=' >/dev/null   if [[ $1 == --package\=* ]]
    688   then   then
    689   package=$(echo $1 | sed 's/^--package=//')   package=${1#--package=}
    690   else   else
    691   package=$2   package=$2
    692   shift   shift
    693   fi   fi
    694   ;;   ;;
    695    
    696     --add-dracut-args)
    697     adddracutargs=--add-dracut-args
    698     ;;
    699    
    700     --add-plymouth-initrd)
    701     addplymouthinitrd=--add-plymouth-initrd
    702     ;;
    703    
    704     --kernel-image*)
    705     if [[ $1 == --kernel-image\=* ]]
    706     then
    707     kernelImage=${1#--kernel-image=}
    708     else
    709     kernelImage="$2"
    710     shift
    711     fi
    712     if ! [[ -f ${kernelImage} ]]
    713     then
    714     echo "Can't find kernel image '${kernelImage}'" >&2
    715     usage
    716     exit 1
    717     fi
    718     ;;
    719    
    720   -v)   -v)
    721   verbose=-v   verbose=-v
    722   ;;   ;;
    # Line 474  then Line 764  then
    764   fi   fi
    765  fi  fi
    766    
    767    [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
    768    
    769  # set the initrd file based on arch; ia64 is the only currently known oddball  # set the initrd file based on arch; ia64 is the only currently known oddball
    770  if [[ -z ${initrdfile} ]]  if [[ -z ${initrdfile} ]]
    771  then  then
    772   INITRD_NAME_PREFIX="initrd"   INITRD_NAME_PREFIX="initrd"
    773     if [[ -n ${dracut} ]]
    774     then
    775     INITRD_NAME_PREFIX="initramfs"
    776     fi
    777    
    778   if [[ $(uname -m) = ia64 ]]   if [[ $(uname -m) = ia64 ]]
    779   then   then
    # Line 488  then Line 784  then
    784  fi  fi
    785  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"  [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
    786    
    787    # add dracut i18n, keyboard and plymouth kernel args if requested
    788    if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    789    then
    790     if [ -r /etc/vconsole.conf ]
    791     then
    792     . /etc/vconsole.conf
    793    
    794     for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
    795     do
    796     val=$(eval echo \$$i)
    797     [[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
    798     done
    799     else
    800     if [ -r /etc/conf.d/consolefont ]
    801     then
    802     . /etc/conf.d/consolefont
    803    
    804     if [[ -n ${CONSOLEFONT} ]]
    805     then
    806     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    807     fi
    808     fi
    809    
    810     if  [ -r /etc/conf.d/keymap ]
    811     then
    812     . /etc/conf.d/keymap
    813    
    814     if [[ -n ${KEYMAP} ]]
    815     then
    816     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    817     fi
    818     fi
    819     fi
    820    
    821     if [ -r /etc/locale.conf ]
    822     then
    823     . /etc/locale.conf
    824    
    825     if [[ -n ${LANG} ]]
    826     then
    827     kernargs="${kernargs} LANG=${LANG}"
    828     fi
    829     fi
    830    fi
    831    
    832  # 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
    833  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&
    834   [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]   [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]
    # Line 506  fi Line 847  fi
    847    
    848  if [[ ${initrd} = make ]]  if [[ ${initrd} = make ]]
    849  then  then
    850   mkinitrd   makeinitrd
    851  elif [[ ${initrd} = remove ]]  elif [[ ${initrd} = remove ]]
    852  then  then
    853   rminitrd   rminitrd
    # Line 519  then Line 860  then
    860  fi  fi
    861    
    862  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    863    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    864    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    865  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    866    [[ -n ${extlinuxConfig} ]] && [ -f ${extlinuxConfig} ] && cfgExtlinux=1
    867    
    868    # if we have a U-Boot directory, but no boot script, check if the directory
    869    # is mounted.  If not, mount it, and then check if a boot script exists.
    870    if [[ -n ${ubootDir} ]]
    871    then
    872     if [ -f ${ubootScript} ]
    873     then
    874     cfguBoot=1
    875     else
    876     mountEntry=$(mount | grep ${ubootDir})
    877     if [[ -z ${mountEntry} ]]
    878     then
    879     mount ${ubootDevice} ${ubootDir}
    880     mounted=1
    881     fi
    882     [ -f ${ubootScript} ] && cfguBoot=1
    883     fi
    884    fi
    885    
    886    # if we're using U-Boot, check if the default load address should change
    887    if [[ -n ${cfguBoot} ]] && [[ -z ${UBOOT_IMGADDR} ]]
    888    then
    889     [[ ${version}  =~ .([^.]*)$ ]]
    890     platform=${BASH_REMATCH[1]}
    891     # A few platforms use an alternate kernel load address
    892     if [[ ${platform} = omap ]]
    893     then
    894     ubootAddress=0x80008000
    895     elif [[ ${platform} = imx ]]
    896     then
    897     ubootAddress=0x90008000
    898     fi
    899    fi
    900    
    901  # 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
    902  # is lilo to determine if it should be run  # is lilo to determine if it should be run
    # Line 539  then Line 916  then
    916   update   update
    917  fi  fi
    918    
    919    # if we mounted the U-Boot directory, unmount it.
    920    [[ -n ${mounted} ]] && umount ${ubootDir}
    921    
    922  exit 0  exit 0
    Legend:
    Removed from v.1332  
    changed lines
      Added in v.2244