Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/new-kernel-pkg

    Diff of /trunk/grubby/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 2240 by niro, Mon Oct 21 13:35:28 2013 UTC
    # 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=${bootPrefix}/${kernelName}-${version} \
    239   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --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=${bootPrefix}/${kernelName}-${version} \
    251   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    # 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=${bootPrefix}/${kernelName}-${version} \
    264   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    # 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=${bootPrefix}/${kernelName}-${version} \
    302   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    # Line 367  remove() Line 336  remove()
    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=${bootPrefix}/${kernelName}-${version}
    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"
    # Line 503  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=${bootPrefix}/${kernelName}-${version} \
    477   ${INITRD} \   ${INITRD} \
    478   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    # 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 796  fi Line 765  fi
    765  # add dracut i18n, keyboard and plymouth kernel args if requested  # add dracut i18n, keyboard and plymouth kernel args if requested
    766  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    767  then  then
    768   [ -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} ]]  
    769   then   then
    770   kernargs="${kernargs} KEYTABLE=${KEYMAP}"   . /etc/vconsole.conf
    771    
    772     for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
    773     do
    774     val=$(eval echo \$$i)
    775     [[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
    776     done
    777     else
    778     if [ -r /etc/conf.d/consolefont ]
    779     then
    780     . /etc/conf.d/consolefont
    781    
    782     if [[ -n ${CONSOLEFONT} ]]
    783     then
    784     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    785     fi
    786     fi
    787    
    788     if  [ -r /etc/conf.d/keymap ]
    789     then
    790     . /etc/conf.d/keymap
    791    
    792     if [[ -n ${KEYMAP} ]]
    793     then
    794     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    795     fi
    796     fi
    797   fi   fi
    798    
    799   if [[ -n ${CONSOLEFONT} ]]   if [ -r /etc/locale.conf ]
    800   then   then
    801   kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"   . /etc/locale.conf
    802    
    803     if [[ -n ${LANG} ]]
    804     then
    805     kernargs="${kernargs} LANG=${LANG}"
    806     fi
    807   fi   fi
    808  fi  fi
    809    
    Legend:
    Removed from v.1940  
    changed lines
      Added in v.2240