Magellan Linux

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

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

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

    revision 2059 by niro, Wed Feb 20 14:28:56 2013 UTC revision 2241 by niro, Mon Oct 21 13:47:50 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
    # Line 368  remove() Line 337  remove()
    337   then   then
    338   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    339   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \   ${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 450  remove() Line 419  remove()
    419   then   then
    420   [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    421   ${grubby} --extlinux -c ${extlinuxConfig} \   ${grubby} --extlinux -c ${extlinuxConfig} \
    422   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${kernelImage}
    423   else   else
    424   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"   [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    425   fi   fi
    # Line 458  remove() Line 427  remove()
    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 480  update() Line 449  update()
    449   then   then
    450   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    451   ${grubby} --grub -c ${grubConfig} \   ${grubby} --grub -c ${grubConfig} \
    452   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${kernelImage} \
    453   ${INITRD} \   ${INITRD} \
    454   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    455   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 492  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 504  update() Line 473  update()
    473   then   then
    474   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    475   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \   ${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 515  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 542  update() Line 511  update()
    511   [[ -n ${verbose} ]] && echo "creating uImage-${version}"   [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    512   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
    513   -e ${ubootAddress} -n ${version} \   -e ${ubootAddress} -n ${version} \
    514   -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}   -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 572  update() Line 541  update()
    541   then   then
    542   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    543   ${grubby} --extlinux -c ${extlinuxConfig} \   ${grubby} --extlinux -c ${extlinuxConfig} \
    544   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${kernelImage} \
    545   ${INITRD} \   ${INITRD} \
    546   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    547   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 638  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 648  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 658  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 668  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 678  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 689  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 710  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 728  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 775  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
    Legend:
    Removed from v.2059  
    changed lines
      Added in v.2241