Magellan Linux

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

    Diff of /tags/grubby-8_37/new-kernel-pkg

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1940 by niro, Mon Oct 1 12:39:50 2012 UTC revision 2248 by niro, Mon Oct 21 13:55:31 2013 UTC
    # Line 170  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 195  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 205  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 213  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    
      if [[ -n ${banner} ]]  
      then  
      title="${banner} [ ${version} ]"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
    237   ${grubby} --grub -c ${grubConfig} \   ${grubby} --grub -c ${grubConfig} \
    238   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${kernelImage} \
    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 241  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} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${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 266  install() Line 259  install()
    259   then   then
    260   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    261    
      if [[ -n ${banner} ]]  
      then  
      title="${banner} [ ${version} ]"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
    262   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    263   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${kernelImage} \
    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 292  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 316  install() Line 297  install()
    297   then   then
    298   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    299    
      if [[ -n ${banner} ]]  
      then  
      title="${banner} [ ${version} ]"  
      elif [ -f /etc/mageversion ]  
      then  
      title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"  
      elif [[ $(read_os_release id) = magellan ]]  
      then  
      title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"  
      else  
      title="Magellan Linux [ ${version} ]"  
      fi  
    300   ${grubby} --extlinux -c ${extlinuxConfig} \   ${grubby} --extlinux -c ${extlinuxConfig} \
    301   --add-kernel=${bootPrefix}/${kernelName}-${version} \   --add-kernel=${kernelImage} \
    302   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    303   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    304   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    # Line 344  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    
    # Line 352  remove() Line 321  remove()
    321   then   then
    322   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    323   ${grubby} --grub -c ${grubConfig} \   ${grubby} --grub -c ${grubConfig} \
    324   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --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 360  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 376  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 435  remove() Line 404  remove()
    404   fi   fi
    405    
    406   mv ${tmpKList} ${ubootDir}/${ubootKList}   mv ${tmpKList} ${ubootDir}/${ubootKList}
    407     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    408   else   else
    409   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"   [[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
    410   [ -f ${tmpKList} ] && rm -f ${tmpKList}   [ -f ${tmpKList} ] && rm -f ${tmpKList}
    # Line 450  remove() Line 420  remove()
    420   then   then
    421   [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    422   ${grubby} --extlinux -c ${extlinuxConfig} \   ${grubby} --extlinux -c ${extlinuxConfig} \
    423   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${kernelImage}
    424   else   else
    425   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    426   fi   fi
    # Line 458  remove() Line 428  remove()
    428    
    429  update()  update()
    430  {  {
    431   if [ ! -f ${bootPrefix}/${kernelName}-${version} ]   if [ ! -f ${kernelImage} ]
    432   then   then
    433   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
    434   return   return
    # Line 480  update() Line 450  update()
    450   then   then
    451   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    452   ${grubby} --grub -c ${grubConfig} \   ${grubby} --grub -c ${grubConfig} \
    453   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${kernelImage} \
    454   ${INITRD} \   ${INITRD} \
    455   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    456   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 492  update() Line 462  update()
    462   then   then
    463   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    464   ${grubby} --grub2 -c ${grub2Config} \   ${grubby} --grub2 -c ${grub2Config} \
    465   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${kernelImage} \
    466   ${INITRD} \   ${INITRD} \
    467   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    468   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 503  update() Line 473  update()
    473   if [[ -n ${cfgGrub2Efi} ]]   if [[ -n ${cfgGrub2Efi} ]]
    474   then   then
    475   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    476   ${grubby} --grub2 -c ${grub2EfiConfig} \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    477   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${kernelImage} \
    478   ${INITRD} \   ${INITRD} \
    479   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    480   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 515  update() Line 485  update()
    485   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    486   then   then
    487   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    488   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --update-kernel=${kernelImage} \
    489   ${INITRD} \   ${INITRD} \
    490   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    491   ${removeargs:+--remove-args="${removeargs}"} \   ${removeargs:+--remove-args="${removeargs}"} \
    # Line 542  update() Line 512  update()
    512   [[ -n ${verbose} ]] && echo "creating uImage-${version}"   [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    513   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
    514   -e ${ubootAddress} -n ${version} \   -e ${ubootAddress} -n ${version} \
    515   -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}   -d ${kernelImage} ${ubootDir}/uImage-${version}
    516    
    517   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    518   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 531  update()
    531   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit   [[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
    532   fi   fi
    533   echo ${version} >> ${ubootDir}/${ubootKList}   echo ${version} >> ${ubootDir}/${ubootKList}
    534     [ -x /sbin/a-b-c ] && /sbin/a-b-c
    535   else   else
    536   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"   [[ -n ${verbose} ]] && echo "cannot make ${version} the default"
    537   fi   fi
    # Line 572  update() Line 543  update()
    543   then   then
    544   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    545   ${grubby} --extlinux -c ${extlinuxConfig} \   ${grubby} --extlinux -c ${extlinuxConfig} \
    546   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${kernelImage} \
    547   ${INITRD} \   ${INITRD} \
    548   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    549   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 614  doDepmod() Line 585  doDepmod()
    585  doRmmoddep()  doRmmoddep()
    586  {  {
    587   [[ -n ${verbose} ]] && echo "removing modules.dep info for ${version}"   [[ -n ${verbose} ]] && echo "removing modules.dep info for ${version}"
    588   [ -d /lib/modules/${version} ] && rm -f /lib/modules/${version}/modules.*   if [ -d /lib/modules/${version} ]
    589     then
    590     rm -f /lib/modules/${version}/modules.*.bin \
    591     /lib/modules/${version}/modules.{alias,dep,devname,symbols,softdep}
    592     fi
    593  }  }
    594    
    595    
    # Line 638  do Line 613  do
    613   ;;   ;;
    614    
    615   --initrdfile*)   --initrdfile*)
    616   if echo $1 | grep '=' >/dev/null   if [[ $1 == --initrdfile\=* ]]
    617   then   then
    618   initrdfile=$(echo $1 | sed 's/^--initrdfile=//')   initrdfile=${1#--initrdfile=}
    619   else   else
    620   initrdfile=$2   initrdfile=$2
    621   shift   shift
    # Line 648  do Line 623  do
    623   ;;   ;;
    624    
    625   --kernel-args*)   --kernel-args*)
    626   if echo $1 | grep '=' >/dev/null   if [[ $1 == --kernel-args\=* ]]
    627   then   then
    628   kernargs=$(echo $1 | sed 's/^--kernel-args=//')   kernargs=${1#--kernel-args=}
    629   else   else
    630   kernargs=$2   kernargs=$2
    631   shift   shift
    # Line 658  do Line 633  do
    633   ;;   ;;
    634    
    635   --remove-args*)   --remove-args*)
    636   if echo $1 | grep '=' >/dev/null   if [[ $1 == --remove-args\=* ]]
    637   then   then
    638   removeargs=$(echo $1 | sed 's/^--remove-args=//')   removeargs=${1#--remove-args=}
    639   else   else
    640   removeargs=$2   removeargs=$2
    641   shift   shift
    # Line 668  do Line 643  do
    643   ;;   ;;
    644    
    645   --banner*)   --banner*)
    646   if echo $1 | grep '=' >/dev/null   if [[ $1 == --banner\=* ]]
    647   then   then
    648   banner=$(echo $1 | sed 's/^--banner=//')   banner=${1#--banner=}
    649   else   else
    650   banner=$2   banner=$2
    651   shift   shift
    # Line 678  do Line 653  do
    653   ;;   ;;
    654    
    655   --multiboot*)   --multiboot*)
    656   if echo $1 |grep '=' >/dev/null   if [[ $1 == --multiboot\=* ]]
    657   then   then
    658   mbkernel=$(echo $1 | sed 's/^--multiboot=//')   mbkernel=${1#--multiboot=}
    659   else   else
    660   # can't really support having an optional second arg here   # can't really support having an optional second arg here
    661   # sorry!   # sorry!
    # Line 689  do Line 664  do
    664   ;;   ;;
    665    
    666   --mbargs*)   --mbargs*)
    667   if echo $1 |grep '=' >/dev/null   if [[ $1 == --mbargs\=* ]]
    668   then   then
    669   mbargs=$(echo $1 | sed 's/^--mbargs=//')   mbargs=${1#--mbargs=}
    670   else   else
    671   mbargs="$2"   mbargs="$2"
    672   shift   shift
    # Line 710  do Line 685  do
    685   makedefault="--make-default"   makedefault="--make-default"
    686   ;;   ;;
    687    
    688   --package)   --package*)
    689   if echo $1 | grep '=' >/dev/null   if [[ $1 == --package\=* ]]
    690   then   then
    691   package=$(echo $1 | sed 's/^--package=//')   package=${1#--package=}
    692   else   else
    693   package=$2   package=$2
    694   shift   shift
    # Line 728  do Line 703  do
    703   addplymouthinitrd=--add-plymouth-initrd   addplymouthinitrd=--add-plymouth-initrd
    704   ;;   ;;
    705    
    706     --kernel-image*)
    707     if [[ $1 == --kernel-image\=* ]]
    708     then
    709     kernelImage=${1#--kernel-image=}
    710     else
    711     kernelImage="$2"
    712     shift
    713     fi
    714     if ! [[ -f ${kernelImage} ]]
    715     then
    716     echo "Can't find kernel image '${kernelImage}'" >&2
    717     usage
    718     exit 1
    719     fi
    720     ;;
    721    
    722   -v)   -v)
    723   verbose=-v   verbose=-v
    724   ;;   ;;
    # Line 775  then Line 766  then
    766   fi   fi
    767  fi  fi
    768    
    769    [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
    770    
    771  # 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
    772  if [[ -z ${initrdfile} ]]  if [[ -z ${initrdfile} ]]
    773  then  then
    # Line 796  fi Line 789  fi
    789  # add dracut i18n, keyboard and plymouth kernel args if requested  # add dracut i18n, keyboard and plymouth kernel args if requested
    790  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    791  then  then
    792   [ -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} ]]  
    793   then   then
    794   kernargs="${kernargs} KEYTABLE=${KEYMAP}"   . /etc/vconsole.conf
    795    
    796     for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
    797     do
    798     val=$(eval echo \$$i)
    799     [[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
    800     done
    801     else
    802     if [ -r /etc/conf.d/consolefont ]
    803     then
    804     . /etc/conf.d/consolefont
    805    
    806     if [[ -n ${CONSOLEFONT} ]]
    807     then
    808     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    809     fi
    810     fi
    811    
    812     if  [ -r /etc/conf.d/keymap ]
    813     then
    814     . /etc/conf.d/keymap
    815    
    816     if [[ -n ${KEYMAP} ]]
    817     then
    818     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    819     fi
    820     fi
    821   fi   fi
    822    
    823   if [[ -n ${CONSOLEFONT} ]]   if [ -r /etc/locale.conf ]
    824   then   then
    825   kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"   . /etc/locale.conf
    826    
    827     if [[ -n ${LANG} ]]
    828     then
    829     kernargs="${kernargs} LANG=${LANG}"
    830     fi
    831   fi   fi
    832  fi  fi
    833    
    Legend:
    Removed from v.1940  
    changed lines
      Added in v.2248