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 1937 by niro, Mon Oct 1 12:33:17 2012 UTC revision 2964 by niro, Wed Jun 29 14:45:50 2016 UTC
    # Line 79  grubConfig="" Line 79  grubConfig=""
    79  grub2Config=""  grub2Config=""
    80  grub2EfiConfig=""  grub2EfiConfig=""
    81  extlinuxConfig=""  extlinuxConfig=""
    82    ubootScript="/boot/boot.scr"
    83    
    84  ARCH=$(uname -m)  ARCH=$(uname -m)
    85    
    # Line 116  elif [[ ${ARCH} =~ armv[5|7].*l ]] Line 117  elif [[ ${ARCH} =~ armv[5|7].*l ]]
    117  then  then
    118   liloConfig=""   liloConfig=""
    119   bootPrefix=/boot   bootPrefix=/boot
    120     extlinuxConfig=$(readlink -f /etc/extlinux.conf 2>/dev/null)
    121   ubootDir=${UBOOT_DIR:-"/boot"}   ubootDir=${UBOOT_DIR:-"/boot"}
    122   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    123   ubootKList=${UBOOT_KLIST:-"klist.txt"}   ubootKList=${UBOOT_KLIST:-"klist.txt"}
    # Line 144  initrd="" Line 146  initrd=""
    146  dracut=""  dracut=""
    147  dracuthostonly=""  dracuthostonly=""
    148  initrdfile=""  initrdfile=""
    149    devtreefile=""
    150  moddep=""  moddep=""
    151  verbose=""  verbose=""
    152  makedefault=""  makedefault=""
    # Line 152  mbkernel="${HYPERVISOR}" Line 155  mbkernel="${HYPERVISOR}"
    155  mbargs="${HYPERVISOR_ARGS}"  mbargs="${HYPERVISOR_ARGS}"
    156  adddracutargs=""  adddracutargs=""
    157  addplymouthinitrd=""  addplymouthinitrd=""
    158    DEBUGARG="systemd.debug"
    159    
    160  usage()  usage()
    161  {  {
    # Line 161  usage() Line 165  usage()
    165   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2   echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
    166   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2   echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
    167   echo "       [--add-plymouth-initrd]" >&2   echo "       [--add-plymouth-initrd]" >&2
    168   echo "       [--host-only]" >&2   echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2
    169   echo "       <--install | --remove | --update> <kernel-version>" >&2   echo "       <--install | --remove | --update> <kernel-version>" >&2
    170   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2   echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
    171   exit 1   exit 1
    172  }  }
    173    
    174    rungrubby()
    175    {
    176     if [[ $1 == --debug ]]
    177     then
    178     [[ ${MAKEDEBUG} != yes ]] && return 0
    179     [[ -n ${verbose} ]] && echo "- First, making a debug entry."
    180     declare -x debugtitle=" with debugging"
    181     declare -x debugargs="${DEBUGARG}"
    182     shift
    183     else
    184     [[ -n ${verbose} ] && echo "- Making a normal entry."
    185     fi
    186     $(eval $grubby $@)
    187     export -n debugargs
    188     export -n debugtitle
    189     unset debugargs
    190     unset debugtitle
    191    }
    192    
    193    set_title()
    194    {
    195     if [[ -n ${banner} ]]
    196     then
    197     if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    198     then
    199     title=$(echo ${banner} | sed 's/ /_/g')
    200     else
    201     title="${banner} [ ${version} ]"
    202     fi
    203     elif [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
    204     then
    205     title=$(echo ${version} | sed 's/ /_/g')
    206     elif [ -f /etc/os-release ]
    207     then
    208     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    209     elif [ -f /etc/mageversion ]
    210     then
    211     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    212     else
    213     title="Magellan Linux [ ${version} ]"
    214     fi
    215    }
    216    
    217  install()  install()
    218  {  {
    219   # 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)
    220   if [ ! -f ${bootPrefix}/${kernelName}-${version} ]   if [ ! -f ${kernelImage} ]
    221   then   then
    222   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
    223   return   return
    # Line 188  install() Line 235  install()
    235   fi   fi
    236   fi   fi
    237    
    238     DEVTREE=""
    239     if [[ x${devtreefile} != x ]] && [ -f "${devtreefile}" ]
    240     then
    241     [[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
    242     DEVTREE="--devtree ${devtreefile}"
    243     fi
    244    
    245   # 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?
    246   if [ -d /proc/iSeries ]   if [ -d /proc/iSeries ]
    247   then   then
    # Line 195  install() Line 249  install()
    249   if [[ -z ${initrdfile} ]]   if [[ -z ${initrdfile} ]]
    250   then   then
    251   [[ -n ${verbose} ]] && echo "No initrd, just adding system map"   [[ -n ${verbose} ]] && echo "No initrd, just adding system map"
    252   /sbin/addSystemMap ${bootPrefix}/System.map-${version} ${bootPrefix}/${kernelName}-${version} ${bootPrefix}/vmlinitrd-${version}   /sbin/addSystemMap ${bootPrefix}/System.map-${version} ${kernelImage} ${bootPrefix}/vmlinitrd-${version}
    253   else   else
    254   /sbin/addSystemMap ${bootPrefix}/System.map-${version} ${bootPrefix}/${kernelName}-${version} ${bootPrefix}/vmlinux.sm-${version}   /sbin/addSystemMap ${bootPrefix}/System.map-${version} ${kernelImage} ${bootPrefix}/vmlinux.sm-${version}
    255   /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
    256   rm ${bootPrefix}/vmlinux.sm-${version}   rm ${bootPrefix}/vmlinux.sm-${version}
    257   fi   fi
    # Line 205  install() Line 259  install()
    259   fi   fi
    260    
    261   # get the root filesystem to use   # get the root filesystem to use
    262   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab  2>/dev/null)
    263     if [[ -z $rootdevice ]]
    264     then
    265     rootdevice=$(grep -o -P "(?<=root=)\S+" /proc/cmdline)
    266     fi
    267    
    268   if [[ -n ${mbkernel} ]] && [[ -n ${cfgLilo} ]] && [[ ${liloFlag} != elilo ]]   if [[ -n ${mbkernel} ]] && [[ -n ${cfgLilo} ]] && [[ ${liloFlag} != elilo ]]
    269   then   then
    # Line 213  install() Line 271  install()
    271   cfgLilo=""   cfgLilo=""
    272   fi   fi
    273    
    274     set_title
    275    
    276   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    277   then   then
    278   [[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"
    279    
    280   if [[ -n ${banner} ]]   ARGS="--grub -c ${grubConfig} --add-kernel=${kernelImage} ${INITRD} \
    281   then   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    282   title="${banner} [ ${version} ]"   ${mbargs:+--mbargs=\"${mbargs}\"} \
    283   elif [ -f /etc/mageversion ]   --title=\"${title}\${debugtitle}\" --copy-default \
    284   then   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    285   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    286   elif [[ $(read_os_release id) = magellan ]]   rungrubby --debug ${ARGS}
    287   then   rungrubby ${ARGS} ${makedefault}
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
      ${grubby} --grub -c ${grubConfig} \  
      --add-kernel=${bootPrefix}/${kernelName}-${version} \  
      ${INITRD} --copy-default ${makedefault} --title "${title}" \  
      ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \  
      --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"  
    288   else   else
    289   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    290   fi   fi
    # Line 241  install() Line 292  install()
    292   then   then
    293   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    294    
    295   if [[ -n ${banner} ]]   ARGS="--grub2 -c ${grub2Config} --add-kernel=${kernelImage} ${INITRD} \
    296   then   --copy-default --title \"${title}\${debugtitle}\" \
    297   title="${banner} [ ${version} ]"   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    298   elif [ -f /etc/mageversion ]   ${mbargs:+--mbargs=\"${mbargs}\"} \
    299   then   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    300   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    301   elif [[ $(read_os_release id) = magellan ]]   rungrubby --debug ${ARGS}
    302   then   rungrubby ${ARGS} ${makedefault}
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
      ${grubby} --grub2 -c ${grub2Config} \  
      --add-kernel=${bootPrefix}/${kernelName}-${version} \  
      ${INITRD} --copy-default ${makedefault} --title "${title}" \  
      ${mbkernel:+--add-multiboot="${mbkernel}"} \  
      ${mbargs:+--mbargs="${mbargs}"} \  
      --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"  
    303   else   else
    304   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    305   fi   fi
    # Line 266  install() Line 307  install()
    307   then   then
    308   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    309    
    310   if [[ -n ${banner} ]]   ARGS="--grub2 -c ${grub2EfiConfig} --efi \
    311   then   --add-kernel=${kernelImage} ${DEVTREE} ${INITRD} \
    312   title="${banner} [ ${version} ]"   --copy-default --title \"${title}\${debugtitle}\" \
    313   elif [ -f /etc/mageversion ]   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    314   then   ${mbargs:+--mbargs=\"${mbargs}\"} \
    315   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    316   elif [[ $(read_os_release id) = magellan ]]   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    317   then   rungrubby --debug ${ARGS}
    318   title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"   rungrubby ${ARGS} ${makedefault}
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
      ${grubby} --grub2 -c ${grub2EfiConfig} \  
      --add-kernel=${bootPrefix}/${kernelName}-${version} \  
      ${INITRD} --copy-default ${makedefault} --title "${title}" \  
      ${mbkernel:+--add-multiboot="${mbkernel}"} \  
      ${mbargs:+--mbargs="${mbargs}"} \  
      --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"  
    319   else   else
    320   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    321   fi   fi
    # Line 292  install() Line 324  install()
    324   then   then
    325   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
    326    
    327   ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} ${INITRD} \   ARGS="--${liloFlag} --add-kernel=${kernelImage} ${INITRD} \
    328   --copy-default ${makedefault} --title ${version} \   --copy-default --title \"${title}\${debugtitle}\" \
    329   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    330   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \   ${mbargs:+--mbargs=\"${mbargs}\"} \
    331   --${liloFlag}   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    332     --remove-kernel=\"TITLE=${version}\""
    333     rungrubby --debug ${ARGS}
    334     rungrubby ${ARGS} ${makedefault}
    335    
    336   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    337   then   then
    # Line 316  install() Line 351  install()
    351   then   then
    352   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    353    
    354   if [[ -n ${banner} ]]   ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
    355   then   ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
    356   title="${banner} [ ${version} ]"   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    357   elif [ -f /etc/mageversion ]   ${mbargs:+--mbargs=\"${mbargs}\"} \
    358   then   --args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
    359   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"   --remove-kernel=\"TITLE=${title}\${debugtitle}\""
    360   elif [[ $(read_os_release id) = magellan ]]   rungrubby --debug ${ARGS}
    361   then   rungrubby ${ARGS} ${makedefault}
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
      ${grubby} --extlinux -c ${extlinuxConfig} \  
      --add-kernel=${bootPrefix}/${kernelName}-${version} \  
      ${INITRD} --copy-default ${makedefault} --title "${title}" \  
      ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \  
      --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"  
    362   else   else
    363   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    364   fi   fi
    # Line 344  remove() Line 370  remove()
    370   if [ -d /proc/iSeries ]   if [ -d /proc/iSeries ]
    371   then   then
    372   [[ -n ${verbose} ]] && echo "On an iSeries, remove img file"   [[ -n ${verbose} ]] && echo "On an iSeries, remove img file"
    373   rm -f ${bootPrefix}/${kernelName}-${version}.img 2>/dev/null   rm -f ${kernelImage}.img 2>/dev/null
    374   return   return
    375   fi   fi
    376    
    # Line 352  remove() Line 378  remove()
    378   then   then
    379   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    380   ${grubby} --grub -c ${grubConfig} \   ${grubby} --grub -c ${grubConfig} \
    381   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${kernelImage}
    382   else   else
    383   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    384   fi   fi
    # Line 360  remove() Line 386  remove()
    386   then   then
    387   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    388   ${grubby} --grub2 -c ${grub2Config} \   ${grubby} --grub2 -c ${grub2Config} \
    389   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${kernelImage}
    390   else   else
    391   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    392   fi   fi
    393   if [[ -n ${cfgGrub2Efi} ]]   if [[ -n ${cfgGrub2Efi} ]]
    394   then   then
    395   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    396   ${grubby} --grub2 -c ${grub2EfiConfig} \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    397   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${kernelImage}
    398   else   else
    399   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    400   fi   fi
    # Line 376  remove() Line 402  remove()
    402   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    403   then   then
    404   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"
    405   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version} --${liloFlag}   ${grubby} --remove-kernel=${kernelImage} --${liloFlag}
    406    
    407   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    408   then   then
    # Line 435  remove() Line 461  remove()
    461   fi   fi
    462    
    463   mv ${tmpKList} ${ubootDir}/${ubootKList}   mv ${tmpKList} ${ubootDir}/${ubootKList}
    464     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    465   else   else
    466   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    467   [ -f ${tmpKList} ] && rm -f ${tmpKList}   [ -f ${tmpKList} ] && rm -f ${tmpKList}
    # Line 450  remove() Line 477  remove()
    477   then   then
    478   [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    479   ${grubby} --extlinux -c ${extlinuxConfig} \   ${grubby} --extlinux -c ${extlinuxConfig} \
    480   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${kernelImage}
    481   else   else
    482   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    483   fi   fi
    # Line 458  remove() Line 485  remove()
    485    
    486  update()  update()
    487  {  {
    488   if [ ! -f ${bootPrefix}/${kernelName}-${version} ]   if [ ! -f ${kernelImage} ]
    489   then   then
    490   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
    491   return   return
    492   fi   fi
    493    
    494     set_title
    495    
    496   INITRD=""   INITRD=""
    497   if [ -f ${initrdfile} ]   if [ -f ${initrdfile} ]
    498   then   then
    # Line 479  update() Line 508  update()
    508   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    509   then   then
    510   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    511   ${grubby} --grub -c ${grubConfig} \   ARGS="--grub -c ${grubConfig} --update-kernel=${kernelImage} ${INITRD} \
    512   --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${kernargs:+--args=\"${kernargs}\"} \
    513   ${INITRD} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    514   ${kernargs:+--args="${kernargs}"} \   ${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
    515   ${removeargs:+--remove-args="${removeargs}"}   --title=\"${title}\${debugtitle}\""
    516     rungrubby --debug ${ARGS}
    517     rungrubby ${ARGS}
    518   else   else
    519   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    520   fi   fi
    # Line 491  update() Line 522  update()
    522   if [[ -n ${cfgGrub2} ]]   if [[ -n ${cfgGrub2} ]]
    523   then   then
    524   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    525   ${grubby} --grub2 -c ${grub2Config} \   ARGS="--grub2 -c ${grub2Config} --update-kernel=${kernelImage} ${INITRD} \
    526   --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${kernargs:+--args=\"${kernargs}\"} \
    527   ${INITRD} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    528   ${kernargs:+--args="${kernargs}"} \   --title=\"${title}\${debugtitle}\""
    529   ${removeargs:+--remove-args="${removeargs}"}   rungrubby --debug ${ARGS}
    530     rungrubby ${ARGS}
    531   else   else
    532   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    533   fi   fi
    # Line 503  update() Line 535  update()
    535   if [[ -n ${cfgGrub2Efi} ]]   if [[ -n ${cfgGrub2Efi} ]]
    536   then   then
    537   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    538   ${grubby} --grub2 -c ${grub2EfiConfig} \   ARGS="--grub2 -c ${grub2EfiConfig} --efi --update-kernel=${kernelImage} \
    539   --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
    540   ${INITRD} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    541   ${kernargs:+--args="${kernargs}"} \   --title=\"${title}\${debugtitle}\""
    542   ${removeargs:+--remove-args="${removeargs}"}   rungrubby --debug ${ARGS}
    543     rungrubby ${ARGS}
    544   else   else
    545   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    546   fi   fi
    # Line 515  update() Line 548  update()
    548   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    549   then   then
    550   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    551   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ARGS="--${liloFlag} --update-kernel=${kernelImage} ${INITRD} \
    552   ${INITRD} \   ${kernargs:+--args=\"${kernargs}\"} \
    553   ${kernargs:+--args="${kernargs}"} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    554   ${removeargs:+--remove-args="${removeargs}"} \   --title=\"${title}\${debugtitle}\""
    555   --${liloFlag}   rungrubby --debug ${ARGS}
    556     rungrubby ${ARGS}
    557    
    558   if [[ -n ${runLilo} ]]   if [[ -n ${runLilo} ]]
    559   then   then
    # Line 542  update() Line 576  update()
    576   [[ -n ${verbose} ]] && echo "creating uImage-${version}"   [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    577   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
    578   -e ${ubootAddress} -n ${version} \   -e ${ubootAddress} -n ${version} \
    579   -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}   -d ${kernelImage} ${ubootDir}/uImage-${version}
    580    
    581   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    582   mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \   mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \
    # Line 561  update() Line 595  update()
    595   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    596   fi   fi
    597   echo ${version} >> ${ubootDir}/${ubootKList}   echo ${version} >> ${ubootDir}/${ubootKList}
    598     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    599   else   else
    600   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    601   fi   fi
    # Line 571  update() Line 606  update()
    606   if [[ -n ${cfgExtlinux} ]]   if [[ -n ${cfgExtlinux} ]]
    607   then   then
    608   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    609   ${grubby} --extlinux -c ${extlinuxConfig} \   ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
    610   --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
    611   ${INITRD} \   ${removeargs:+--remove-args=\"${removeargs}\"} \
    612   ${kernargs:+--args="${kernargs}"} \   --title=\"${title}\${debugtitle}\""
    613   ${removeargs:+--remove-args="${removeargs}"}   rungrubby --debug ${ARGS}
    614     rungrubby ${ARGS}
    615   else   else
    616   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    617   fi   fi
    # Line 614  doDepmod() Line 650  doDepmod()
    650  doRmmoddep()  doRmmoddep()
    651  {  {
    652   [[ -n ${verbose} ]] && echo "removing modules.dep info for ${version}"   [[ -n ${verbose} ]] && echo "removing modules.dep info for ${version}"
    653   [ -d /lib/modules/${version} ] && rm -f /lib/modules/${version}/modules.*   if [ -d /lib/modules/${version} ]
    654     then
    655     rm -f /lib/modules/${version}/modules.*.bin \
    656     /lib/modules/${version}/modules.{alias,dep,devname,symbols,softdep}
    657     fi
    658  }  }
    659    
    660    
    # Line 629  do Line 669  do
    669   initrd="remove"   initrd="remove"
    670   ;;   ;;
    671    
    672     --devtree*)
    673     if [[ $1 == --devtree\=* ]]
    674     then
    675     devtreefile="${1#--devtreefile=}"
    676     else
    677     devtreefile="$2"
    678     shift
    679     fi
    680     ;;
    681    
    682   --dracut)   --dracut)
    683   dracut=--dracut   dracut=--dracut
    684   ;;   ;;
    # Line 638  do Line 688  do
    688   ;;   ;;
    689    
    690   --initrdfile*)   --initrdfile*)
    691   if echo $1 | grep '=' >/dev/null   if [[ $1 == --initrdfile\=* ]]
    692   then   then
    693   initrdfile=$(echo $1 | sed 's/^--initrdfile=//')   initrdfile=${1#--initrdfile=}
    694   else   else
    695   initrdfile=$2   initrdfile=$2
    696   shift   shift
    # Line 648  do Line 698  do
    698   ;;   ;;
    699    
    700   --kernel-args*)   --kernel-args*)
    701   if echo $1 | grep '=' >/dev/null   if [[ $1 == --kernel-args\=* ]]
    702   then   then
    703   kernargs=$(echo $1 | sed 's/^--kernel-args=//')   kernargs=${1#--kernel-args=}
    704   else   else
    705   kernargs=$2   kernargs=$2
    706   shift   shift
    # Line 658  do Line 708  do
    708   ;;   ;;
    709    
    710   --remove-args*)   --remove-args*)
    711   if echo $1 | grep '=' >/dev/null   if [[ $1 == --remove-args\=* ]]
    712   then   then
    713   removeargs=$(echo $1 | sed 's/^--remove-args=//')   removeargs=${1#--remove-args=}
    714   else   else
    715   removeargs=$2   removeargs=$2
    716   shift   shift
    # Line 668  do Line 718  do
    718   ;;   ;;
    719    
    720   --banner*)   --banner*)
    721   if echo $1 | grep '=' >/dev/null   if [[ $1 == --banner\=* ]]
    722   then   then
    723   banner=$(echo $1 | sed 's/^--banner=//')   banner=${1#--banner=}
    724   else   else
    725   banner=$2   banner=$2
    726   shift   shift
    # Line 678  do Line 728  do
    728   ;;   ;;
    729    
    730   --multiboot*)   --multiboot*)
    731   if echo $1 |grep '=' >/dev/null   if [[ $1 == --multiboot\=* ]]
    732   then   then
    733   mbkernel=$(echo $1 | sed 's/^--multiboot=//')   mbkernel=${1#--multiboot=}
    734   else   else
    735   # can't really support having an optional second arg here   # can't really support having an optional second arg here
    736   # sorry!   # sorry!
    # Line 689  do Line 739  do
    739   ;;   ;;
    740    
    741   --mbargs*)   --mbargs*)
    742   if echo $1 |grep '=' >/dev/null   if [[ $1 == --mbargs\=* ]]
    743   then   then
    744   mbargs=$(echo $1 | sed 's/^--mbargs=//')   mbargs=${1#--mbargs=}
    745   else   else
    746   mbargs="$2"   mbargs="$2"
    747   shift   shift
    # Line 710  do Line 760  do
    760   makedefault="--make-default"   makedefault="--make-default"
    761   ;;   ;;
    762    
    763   --package)   --package*)
    764   if echo $1 | grep '=' >/dev/null   if [[ $1 == --package\=* ]]
    765   then   then
    766   package=$(echo $1 | sed 's/^--package=//')   package=${1#--package=}
    767   else   else
    768   package=$2   package=$2
    769   shift   shift
    # Line 728  do Line 778  do
    778   addplymouthinitrd=--add-plymouth-initrd   addplymouthinitrd=--add-plymouth-initrd
    779   ;;   ;;
    780    
    781     --kernel-image*)
    782     if [[ $1 == --kernel-image\=* ]]
    783     then
    784     kernelImage=${1#--kernel-image=}
    785     else
    786     kernelImage="$2"
    787     shift
    788     fi
    789     if ! [[ -f ${kernelImage} ]]
    790     then
    791     echo "Can't find kernel image '${kernelImage}'" >&2
    792     usage
    793     exit 1
    794     fi
    795     ;;
    796    
    797   -v)   -v)
    798   verbose=-v   verbose=-v
    799   ;;   ;;
    # Line 775  then Line 841  then
    841   fi   fi
    842  fi  fi
    843    
    844    [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
    845    
    846  # 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
    847  if [[ -z ${initrdfile} ]]  if [[ -z ${initrdfile} ]]
    848  then  then
    # Line 796  fi Line 864  fi
    864  # add dracut i18n, keyboard and plymouth kernel args if requested  # add dracut i18n, keyboard and plymouth kernel args if requested
    865  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    866  then  then
    867   [ -r /etc/conf.d/keymap ] && . /etc/conf.d/keymap   if [ -r /etc/vconsole.conf ]
      [ -r /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont  
       
      if [[ -n ${KEYMAP} ]]  
    868   then   then
    869   kernargs="${kernargs} KEYTABLE=${KEYMAP}"   . /etc/vconsole.conf
    870    
    871     for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
    872     do
    873     val=$(eval echo \$$i)
    874     [[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
    875     done
    876     else
    877     if [ -r /etc/conf.d/consolefont ]
    878     then
    879     . /etc/conf.d/consolefont
    880    
    881     if [[ -n ${CONSOLEFONT} ]]
    882     then
    883     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    884     fi
    885     fi
    886    
    887     if  [ -r /etc/conf.d/keymap ]
    888     then
    889     . /etc/conf.d/keymap
    890    
    891     if [[ -n ${KEYMAP} ]]
    892     then
    893     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    894     fi
    895     fi
    896   fi   fi
    897    
    898   if [[ -n ${CONSOLEFONT} ]]   if [ -r /etc/locale.conf ]
    899   then   then
    900   kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"   . /etc/locale.conf
    901    
    902     if [[ -n ${LANG} ]]
    903     then
    904     kernargs="${kernargs} LANG=${LANG}"
    905     fi
    906   fi   fi
    907  fi  fi
    908    
    909  # 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
    910  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] &&  if [[ ${mode} = --install ]] && [[ ${UPDATEDEFAULT} = yes ]] && [[ -n ${package} ]] && [[ -n ${DEFAULTKERNEL} ]]
      [[ -n ${DEFAULTKERNEL} ]] && [[ ${package} = ${DEFAULTKERNEL} ]]  
    911  then  then
    912   makedefault="--make-default"   if [[ ${package} = ${DEFAULTKERNEL} ]] || [[ ${package}-core = ${DEFAULTKERNEL} ]]
    913   [[ -n ${verbose} ]] && echo "making it the default based on config"   then
    914     makedefault="--make-default"
    915     [[ -n ${verbose} ]] && echo "making it the default based on config"
    916     fi
    917  fi  fi
    918    
    919  if [[ ${moddep} = make ]]  if [[ ${moddep} = make ]]
    Legend:
    Removed from v.1937  
    changed lines
      Added in v.2964