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 1702 by niro, Sat Feb 18 00:21:34 2012 UTC revision 2241 by niro, Mon Oct 21 13:47:50 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 46  cfgGrub2="" Line 72  cfgGrub2=""
    72  cfgGrub2Efi=""  cfgGrub2Efi=""
    73  cfgGrub=""  cfgGrub=""
    74  cfgLilo=""  cfgLilo=""
    75    cfgExtlinux=""
    76  cfguBoot=""  cfguBoot=""
    77  runLilo=""  runLilo=""
    78  grubConfig=""  grubConfig=""
    79  grub2Config=""  grub2Config=""
    80  grub2EfiConfig=""  grub2EfiConfig=""
    81    extlinuxConfig=""
    82    
    83  ARCH=$(uname -m)  ARCH=$(uname -m)
    84    
    # Line 63  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 83  then Line 112  then
    112   lilo=/sbin/zipl   lilo=/sbin/zipl
    113   runLilo="yes"   runLilo="yes"
    114   isx86=""   isx86=""
    115  elif [[ ${ARCH} = armv7l ]]  elif [[ ${ARCH} =~ armv[5|7].*l ]]
    116  then  then
    117   liloConfig=""   liloConfig=""
    118   bootPrefix=/boot   bootPrefix=/boot
    119   ubootDir=${UBOOT_DIR:-"/boot/uboot"}   ubootDir=${UBOOT_DIR:-"/boot"}
    120   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}   ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
    121   ubootKList=${UBOOT_KLIST:-"klist.txt"}   ubootKList=${UBOOT_KLIST:-"klist.txt"}
    122   ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}   ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
    123   ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}   ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}
    124   ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}   ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}
    125     ubootAddress=${UBOOT_IMGADDR:-"0x00008000"}
    126   mounted=""   mounted=""
    127   liloFlag=""   liloFlag=""
    128   isx86=""   isx86=""
    # Line 102  else Line 132  else
    132   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    133   grub2Config=/boot/grub/grub.cfg   grub2Config=/boot/grub/grub.cfg
    134   grub2EfiConfig=/boot/grub/grub-efi.cfg   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 117  moddep="" Line 148  moddep=""
    148  verbose=""  verbose=""
    149  makedefault=""  makedefault=""
    150  package=""  package=""
    151  mbkernel=""  mbkernel="${HYPERVISOR}"
    152  mbargs=""  mbargs="${HYPERVISOR_ARGS}"
    153  adddracutargs=""  adddracutargs=""
    154  addplymouthinitrd=""  addplymouthinitrd=""
    155    
    # Line 139  usage() Line 170  usage()
    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 164  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
    # Line 174  install() Line 205  install()
    205   fi   fi
    206    
    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 182  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} --grub --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}"
    # Line 206  install() Line 246  install()
    246   then   then
    247   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    248    
      if [[ -n ${banner} ]]  
      then  
      title="${banner} (${version})"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) (${version})"  
      else  
      title="Magellan Linux (${version})"  
      fi  
    249   ${grubby} --grub2 -c ${grub2Config} \   ${grubby} --grub2 -c ${grub2Config} \
    250   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${kernelImage} \
    251   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    252   ${mbkernel:+--add-multiboot="${mbkernel}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} \
    253   ${mbargs:+--mbargs="${mbargs}"} \   ${mbargs:+--mbargs="${mbargs}"} \
    # Line 228  install() Line 259  install()
    259   then   then
    260   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    261    
    262   if [[ -n ${banner} ]]   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    263   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} --grub2 -c ${grub2EfiConfig} \  
      --add-kernel=${bootPrefix}/${kernelName}-${version} \  
    264   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    265   ${mbkernel:+--add-multiboot="${mbkernel}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} \
    266   ${mbargs:+--mbargs="${mbargs}"} \   ${mbargs:+--mbargs="${mbargs}"} \
    # Line 251  install() Line 273  install()
    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 270  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 278  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    
    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} --grub --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 for grub 0.97"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    327   fi   fi
    # Line 293  remove() Line 329  remove()
    329   then   then
    330   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    331   ${grubby} --grub2 -c ${grub2Config} \   ${grubby} --grub2 -c ${grub2Config} \
    332   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${kernelImage}
    333   else   else
    334   [[ -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"
    335   fi   fi
    336   if [[ -n ${cfgGrub2Efi} ]]   if [[ -n ${cfgGrub2Efi} ]]
    337   then   then
    338   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    339   ${grubby} --grub2 -c ${grub2EfiConfig} \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    340   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${kernelImage}
    341   else   else
    342   [[ -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"
    343   fi   fi
    # Line 309  remove() Line 345  remove()
    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 333  remove() Line 369  remove()
    369   then   then
    370   tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)   tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX)
    371   curversion=$(tail -n1 ${ubootDir}/${ubootKList})   curversion=$(tail -n1 ${ubootDir}/${ubootKList})
    372   sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList}   sed "/$version$/d" ${ubootDir}/${ubootKList} > ${tmpKList}
    373   newversion=$(tail -n1 ${tmpKList})   newversion=$(tail -n1 ${tmpKList})
    374   if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]   if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ]
    375   then   then
    # Line 373  remove() Line 409  remove()
    409   [ -f ${tmpKList} ] && rm -f ${tmpKList}   [ -f ${tmpKList} ] && rm -f ${tmpKList}
    410   fi   fi
    411   else   else
    412   [[ -n ${verbose} ]] && echo "No previous kernel version. uBoot images not removed!"   [[ -n ${verbose} ]] && echo "No previous kernel version.  U-Boot images not removed!"
    413   fi   fi
    414   else   else
    415   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"
    416   fi   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 403  update() Line 448  update()
    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 415  update() Line 461  update()
    461   then   then
    462   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    463   ${grubby} --grub2 -c ${grub2Config} \   ${grubby} --grub2 -c ${grub2Config} \
    464   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${kernelImage} \
    465   ${INITRD} \   ${INITRD} \
    466   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    467   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 426  update() Line 472  update()
    472   if [[ -n ${cfgGrub2Efi} ]]   if [[ -n ${cfgGrub2Efi} ]]
    473   then   then
    474   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    475   ${grubby} --grub2 -c ${grub2EfiConfig} \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    476   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${kernelImage} \
    477   ${INITRD} \   ${INITRD} \
    478   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    479   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 438  update() Line 484  update()
    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 463  update() Line 509  update()
    509   [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."   [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."
    510    
    511   [[ -n ${verbose} ]] && echo "creating uImage-${version}"   [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    512   mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 \   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
    513   -n ${version} -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}   -e ${ubootAddress} -n ${version} \
    514     -d ${kernelImage} ${ubootDir}/uImage-${version}
    515    
    516   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    517   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 489  update() Line 536  update()
    536   else   else
    537   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"
    538   fi   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} ]]   if [[ -n ${dracut} ]]
    556   then   then
    557   tool="/sbin/dracut ${dracuthostonly} -f ${initrdfile} ${version}"   tool="dracut ${dracuthostonly} -f ${initrdfile} ${version}"
    558   else   else
    559   tool="/sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}"   tool="mkinitrd --allow-missing -f ${initrdfile} ${version}"
    560   fi   fi
    561   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"
    562   ${tool}   ${tool}
    # Line 548  do Line 607  do
    607   ;;   ;;
    608    
    609   --initrdfile*)   --initrdfile*)
    610   if echo $1 | grep '=' >/dev/null   if [[ $1 == --initrdfile\=* ]]
    611   then   then
    612   initrdfile=$(echo $1 | sed 's/^--initrdfile=//')   initrdfile=${1#--initrdfile=}
    613   else   else
    614   initrdfile=$2   initrdfile=$2
    615   shift   shift
    # Line 558  do Line 617  do
    617   ;;   ;;
    618    
    619   --kernel-args*)   --kernel-args*)
    620   if echo $1 | grep '=' >/dev/null   if [[ $1 == --kernel-args\=* ]]
    621   then   then
    622   kernargs=$(echo $1 | sed 's/^--kernel-args=//')   kernargs=${1#--kernel-args=}
    623   else   else
    624   kernargs=$2   kernargs=$2
    625   shift   shift
    # Line 568  do Line 627  do
    627   ;;   ;;
    628    
    629   --remove-args*)   --remove-args*)
    630   if echo $1 | grep '=' >/dev/null   if [[ $1 == --remove-args\=* ]]
    631   then   then
    632   removeargs=$(echo $1 | sed 's/^--remove-args=//')   removeargs=${1#--remove-args=}
    633   else   else
    634   removeargs=$2   removeargs=$2
    635   shift   shift
    # Line 578  do Line 637  do
    637   ;;   ;;
    638    
    639   --banner*)   --banner*)
    640   if echo $1 | grep '=' >/dev/null   if [[ $1 == --banner\=* ]]
    641   then   then
    642   banner=$(echo $1 | sed 's/^--banner=//')   banner=${1#--banner=}
    643   else   else
    644   banner=$2   banner=$2
    645   shift   shift
    # Line 588  do Line 647  do
    647   ;;   ;;
    648    
    649   --multiboot*)   --multiboot*)
    650   if echo $1 |grep '=' >/dev/null   if [[ $1 == --multiboot\=* ]]
    651   then   then
    652   mbkernel=$(echo $1 | sed 's/^--multiboot=//')   mbkernel=${1#--multiboot=}
    653   else   else
    654   # can't really support having an optional second arg here   # can't really support having an optional second arg here
    655   # sorry!   # sorry!
    # Line 599  do Line 658  do
    658   ;;   ;;
    659    
    660   --mbargs*)   --mbargs*)
    661   if echo $1 |grep '=' >/dev/null   if [[ $1 == --mbargs\=* ]]
    662   then   then
    663   mbargs=$(echo $1 | sed 's/^--mbargs=//')   mbargs=${1#--mbargs=}
    664   else   else
    665   mbargs="$2"   mbargs="$2"
    666   shift   shift
    # Line 620  do Line 679  do
    679   makedefault="--make-default"   makedefault="--make-default"
    680   ;;   ;;
    681    
    682   --package)   --package*)
    683   if echo $1 | grep '=' >/dev/null   if [[ $1 == --package\=* ]]
    684   then   then
    685   package=$(echo $1 | sed 's/^--package=//')   package=${1#--package=}
    686   else   else
    687   package=$2   package=$2
    688   shift   shift
    # Line 638  do Line 697  do
    697   addplymouthinitrd=--add-plymouth-initrd   addplymouthinitrd=--add-plymouth-initrd
    698   ;;   ;;
    699    
    700     --kernel-image*)
    701     if [[ $1 == --kernel-image\=* ]]
    702     then
    703     kernelImage=${1#--kernel-image=}
    704     else
    705     kernelImage="$2"
    706     shift
    707     fi
    708     if ! [[ -f ${kernelImage} ]]
    709     then
    710     echo "Can't find kernel image '${kernelImage}'" >&2
    711     usage
    712     exit 1
    713     fi
    714     ;;
    715    
    716   -v)   -v)
    717   verbose=-v   verbose=-v
    718   ;;   ;;
    # Line 685  then Line 760  then
    760   fi   fi
    761  fi  fi
    762    
    763    [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
    764    
    765  # 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
    766  if [[ -z ${initrdfile} ]]  if [[ -z ${initrdfile} ]]
    767  then  then
    # Line 706  fi Line 783  fi
    783  # add dracut i18n, keyboard and plymouth kernel args if requested  # add dracut i18n, keyboard and plymouth kernel args if requested
    784  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    785  then  then
    786   [ -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} ]]  
    787   then   then
    788   kernargs="${kernargs} KEYTABLE=${KEYMAP}"   . /etc/vconsole.conf
    789    
    790     for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
    791     do
    792     val=$(eval echo \$$i)
    793     [[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
    794     done
    795     else
    796     if [ -r /etc/conf.d/consolefont ]
    797     then
    798     . /etc/conf.d/consolefont
    799    
    800     if [[ -n ${CONSOLEFONT} ]]
    801     then
    802     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    803     fi
    804     fi
    805    
    806     if  [ -r /etc/conf.d/keymap ]
    807     then
    808     . /etc/conf.d/keymap
    809    
    810     if [[ -n ${KEYMAP} ]]
    811     then
    812     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    813     fi
    814     fi
    815   fi   fi
    816    
    817   if [[ -n ${CONSOLEFONT} ]]   if [ -r /etc/locale.conf ]
    818   then   then
    819   kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"   . /etc/locale.conf
    820    
    821     if [[ -n ${LANG} ]]
    822     then
    823     kernargs="${kernargs} LANG=${LANG}"
    824     fi
    825   fi   fi
    826  fi  fi
    827    
    # Line 738  fi Line 843  fi
    843    
    844  if [[ ${initrd} = make ]]  if [[ ${initrd} = make ]]
    845  then  then
    846   mkinitrd   makeinitrd
    847  elif [[ ${initrd} = remove ]]  elif [[ ${initrd} = remove ]]
    848  then  then
    849   rminitrd   rminitrd
    # Line 754  fi Line 859  fi
    859  [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1  [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    860  [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1  [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    861  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    862    [[ -n ${extlinuxConfig} ]] && [ -f ${extlinuxConfig} ] && cfgExtlinux=1
    863    
    864  # if we have a uBoot directory, check if it is mounted.  # if we have a U-Boot directory, but no boot script, check if the directory
    865  # if not, mount it. Then check if a boot script exists.  # is mounted.  If not, mount it, and then check if a boot script exists.
    866  if [[ -n ${ubootDir} ]]  if [[ -n ${ubootDir} ]]
    867  then  then
    868   mountEntry=$(mount | grep ${ubootDir})   if [ -f ${ubootScript} ]
      if [[ -z ${mountEntry} ]]  
    869   then   then
    870   mount ${ubootDevice} ${ubootDir}   cfguBoot=1
    871   mounted=1   else
    872     mountEntry=$(mount | grep ${ubootDir})
    873     if [[ -z ${mountEntry} ]]
    874     then
    875     mount ${ubootDevice} ${ubootDir}
    876     mounted=1
    877     fi
    878     [ -f ${ubootScript} ] && cfguBoot=1
    879     fi
    880    fi
    881    
    882    # if we're using U-Boot, check if the default load address should change
    883    if [[ -n ${cfguBoot} ]] && [[ -z ${UBOOT_IMGADDR} ]]
    884    then
    885     [[ ${version}  =~ .([^.]*)$ ]]
    886     platform=${BASH_REMATCH[1]}
    887     # A few platforms use an alternate kernel load address
    888     if [[ ${platform} = omap ]]
    889     then
    890     ubootAddress=0x80008000
    891     elif [[ ${platform} = imx ]]
    892     then
    893     ubootAddress=0x90008000
    894   fi   fi
      [ -f ${ubootScript} ] && cfguBoot=1  
    895  fi  fi
    896    
    897  # 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
    # Line 786  then Line 912  then
    912   update   update
    913  fi  fi
    914    
    915    # if we mounted the U-Boot directory, unmount it.
    916    [[ -n ${mounted} ]] && umount ${ubootDir}
    917    
    918  exit 0  exit 0
    Legend:
    Removed from v.1702  
    changed lines
      Added in v.2241