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 1691 by niro, Fri Feb 17 23:10:15 2012 UTC revision 1803 by niro, Mon Apr 16 17:51:27 2012 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 42  fi Line 68  fi
    68  [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby  [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby
    69  [ -f /etc/conf.d/grubby-uboot ] && . /etc/conf.d/grubby-uboot  [ -f /etc/conf.d/grubby-uboot ] && . /etc/conf.d/grubby-uboot
    70    
    71    cfgGrub2=""
    72    cfgGrub2Efi=""
    73  cfgGrub=""  cfgGrub=""
    74  cfgLilo=""  cfgLilo=""
    75    cfgExtlinux=""
    76  cfguBoot=""  cfguBoot=""
    77  runLilo=""  runLilo=""
    78  grubConfig=""  grubConfig=""
    79    grub2Config=""
    80    grub2EfiConfig=""
    81    extlinuxConfig=""
    82    
    83  ARCH=$(uname -m)  ARCH=$(uname -m)
    84    
    # Line 59  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 79  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} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
    116  then  then
    117     machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
    118   liloConfig=""   liloConfig=""
    119   bootPrefix=/boot   bootPrefix=/boot
    120   ubootDir=${UBOOT_DIR:-"/boot/uboot"}   ubootDir=${UBOOT_DIR:-"/boot/uboot"}
    # Line 92  then Line 126  then
    126   mounted=""   mounted=""
    127   liloFlag=""   liloFlag=""
    128   isx86=""   isx86=""
    129     if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]
    130     then
    131     ubootAddress=0x80008000
    132     else
    133     ubootAddress=0x00008000
    134     fi
    135  else  else
    136   # this leaves i?86 and x86_64   # this leaves i?86 and x86_64
    137   liloConfig=/etc/lilo.conf   liloConfig=/etc/lilo.conf
    138   grubConfig=/boot/grub/grub.conf   grubConfig=/boot/grub/grub.conf
    139     grub2Config=/boot/grub/grub.cfg
    140     grub2EfiConfig=/boot/grub/grub-efi.cfg
    141     extlinuxConfig=/boot/extlinux/extlinux.conf
    142   bootPrefix=/boot   bootPrefix=/boot
    143   liloFlag=lilo   liloFlag=lilo
    144   isx86="yes"   isx86="yes"
    # Line 111  moddep="" Line 154  moddep=""
    154  verbose=""  verbose=""
    155  makedefault=""  makedefault=""
    156  package=""  package=""
    157  mbkernel=""  mbkernel="${HYPERVISOR}"
    158  mbargs=""  mbargs="${HYPERVISOR_ARGS}"
    159  adddracutargs=""  adddracutargs=""
    160  addplymouthinitrd=""  addplymouthinitrd=""
    161    
    # Line 130  usage() Line 173  usage()
    173   exit 1   exit 1
    174  }  }
    175    
     run_grub2()  
     {  
      if [ -d /boot/grub -a -x /sbin/grub-mkconfig ]  
      then  
      cp /boot/grub/grub.cfg /boot/grub/grub.cfg.old  
      /sbin/grub-mkconfig -o /boot/grub/grub.cfg  
      fi  
     }  
       
    176  install()  install()
    177  {  {
    178   # 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)
    # Line 176  install() Line 210  install()
    210   return   return
    211   fi   fi
    212    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    213   # get the root filesystem to use   # get the root filesystem to use
    214   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)   rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
    215    
    # Line 194  install() Line 225  install()
    225    
    226   if [[ -n ${banner} ]]   if [[ -n ${banner} ]]
    227   then   then
    228   title="${banner} (${version})"   title="${banner} [ ${version} ]"
    229   elif [ -f /etc/mageversion ]   elif [ -f /etc/mageversion ]
    230   then   then
    231   title="Magellan Linux $(< /etc/mageversion) (${version})"   title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    232     elif [[ $(read_os_release id) = magellan ]]
    233     then
    234     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    235   else   else
    236   title="Magellan Linux (${version})"   title="Magellan Linux [ ${version} ]"
    237   fi   fi
    238   ${grubby} --add-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    239     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    240   ${INITRD} --copy-default ${makedefault} --title "${title}" \   ${INITRD} --copy-default ${makedefault} --title "${title}" \
    241   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \   ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    242   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"   --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    243   else   else
    244   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    245     fi
    246     if [[ -n ${cfgGrub2} ]]
    247     then
    248     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
    249    
    250     if [[ -n ${banner} ]]
    251     then
    252     title="${banner} [ ${version} ]"
    253     elif [ -f /etc/mageversion ]
    254     then
    255     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    256     elif [[ $(read_os_release id) = magellan ]]
    257     then
    258     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    259     else
    260     title="Magellan Linux [ ${version} ]"
    261     fi
    262     ${grubby} --grub2 -c ${grub2Config} \
    263     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    264     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    265     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    266     ${mbargs:+--mbargs="${mbargs}"} \
    267     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    268     else
    269     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    270     fi
    271     if [[ -n ${cfgGrub2Efi} ]]
    272     then
    273     [[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
    274    
    275     if [[ -n ${banner} ]]
    276     then
    277     title="${banner} [ ${version} ]"
    278     elif [ -f /etc/mageversion ]
    279     then
    280     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    281     elif [[ $(read_os_release id) = magellan ]]
    282     then
    283     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    284     else
    285     title="Magellan Linux [ ${version} ]"
    286     fi
    287     ${grubby} --grub2 -c ${grub2EfiConfig} \
    288     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    289     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    290     ${mbkernel:+--add-multiboot="${mbkernel}"} \
    291     ${mbargs:+--mbargs="${mbargs}"} \
    292     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    293     else
    294     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
    295   fi   fi
    296    
    297   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 232  install() Line 317  install()
    317   else   else
    318   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby"
    319   fi   fi
    320    
    321     if [[ -n ${cfgExtlinux} ]]
    322     then
    323     [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
    324    
    325     if [[ -n ${banner} ]]
    326     then
    327     title="${banner} [ ${version} ]"
    328     elif [ -f /etc/mageversion ]
    329     then
    330     title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
    331     elif [[ $(read_os_release id) = magellan ]]
    332     then
    333     title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
    334     else
    335     title="Magellan Linux [ ${version} ]"
    336     fi
    337     ${grubby} --extlinux -c ${extlinuxConfig} \
    338     --add-kernel=${bootPrefix}/${kernelName}-${version} \
    339     ${INITRD} --copy-default ${makedefault} --title "${title}" \
    340     ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
    341     --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}"
    342     else
    343     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    344     fi
    345  }  }
    346    
    347  remove()  remove()
    # Line 244  remove() Line 354  remove()
    354   return   return
    355   fi   fi
    356    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    357   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    358   then   then
    359   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
    360   ${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}   ${grubby} --grub -c ${grubConfig} \
    361     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    362   else   else
    363   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
    364     fi
    365     if [[ -n ${cfgGrub2} ]]
    366     then
    367     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
    368     ${grubby} --grub2 -c ${grub2Config} \
    369     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    370     else
    371     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
    372     fi
    373     if [[ -n ${cfgGrub2Efi} ]]
    374     then
    375     [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    376     ${grubby} --grub2 -c ${grub2EfiConfig} \
    377     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    378     else
    379     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    380   fi   fi
    381    
    382   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    # Line 322  remove() Line 446  remove()
    446   [ -f ${tmpKList} ] && rm -f ${tmpKList}   [ -f ${tmpKList} ] && rm -f ${tmpKList}
    447   fi   fi
    448   else   else
    449   [[ -n ${verbose} ]] && echo "No previous kernel version. uBoot images not removed!"   [[ -n ${verbose} ]] && echo "No previous kernel version.  U-Boot images not removed!"
    450   fi   fi
    451   else   else
    452   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}"
    453   fi   fi
    454    
    455     if [[ -n ${cfgExtlinux} ]]
    456     then
    457     [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}"
    458     ${grubby} --extlinux -c ${extlinuxConfig} \
    459     --remove-kernel=${bootPrefix}/${kernelName}-${version}
    460     else
    461     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
    462     fi
    463  }  }
    464    
    465  update()  update()
    # Line 349  update() Line 482  update()
    482   fi   fi
    483   fi   fi
    484    
      # Run grub2's configuration update in parallel, if it is installed  
      run_grub2  
       
    485   if [[ -n ${cfgGrub} ]]   if [[ -n ${cfgGrub} ]]
    486   then   then
    487   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
    488   ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \   ${grubby} --grub -c ${grubConfig} \
    489     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    490   ${INITRD} \   ${INITRD} \
    491   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    492   ${removeargs:+--remove-args="${removeargs}"}   ${removeargs:+--remove-args="${removeargs}"}
    # Line 363  update() Line 494  update()
    494   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"   [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
    495   fi   fi
    496    
    497     if [[ -n ${cfgGrub2} ]]
    498     then
    499     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
    500     ${grubby} --grub2 -c ${grub2Config} \
    501     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    502     ${INITRD} \
    503     ${kernargs:+--args="${kernargs}"} \
    504     ${removeargs:+--remove-args="${removeargs}"}
    505     else
    506     [[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
    507     fi
    508    
    509     if [[ -n ${cfgGrub2Efi} ]]
    510     then
    511     [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    512     ${grubby} --grub2 -c ${grub2EfiConfig} \
    513     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    514     ${INITRD} \
    515     ${kernargs:+--args="${kernargs}"} \
    516     ${removeargs:+--remove-args="${removeargs}"}
    517     else
    518     [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
    519     fi
    520    
    521   if [[ -n ${cfgLilo} ]]   if [[ -n ${cfgLilo} ]]
    522   then   then
    523   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
    # Line 391  update() Line 546  update()
    546   [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."   [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..."
    547    
    548   [[ -n ${verbose} ]] && echo "creating uImage-${version}"   [[ -n ${verbose} ]] && echo "creating uImage-${version}"
    549   mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 \   mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \
    550   -n ${version} -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}   -e ${ubootAddress} -n ${version} \
    551     -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version}
    552    
    553   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"   [[ -n ${verbose} ]] && echo "creating uInitrd-${version}"
    554   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 417  update() Line 573  update()
    573   else   else
    574   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"   [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}"
    575   fi   fi
    576    
    577     if [[ -n ${cfgExtlinux} ]]
    578     then
    579     [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
    580     ${grubby} --extlinux -c ${extlinuxConfig} \
    581     --update-kernel=${bootPrefix}/${kernelName}-${version} \
    582     ${INITRD} \
    583     ${kernargs:+--args="${kernargs}"} \
    584     ${removeargs:+--remove-args="${removeargs}"}
    585     else
    586     [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
    587     fi
    588  }  }
    589    
    590  mkinitrd()  makeinitrd()
    591  {  {
    592   if [[ -n ${dracut} ]]   if [[ -n ${dracut} ]]
    593   then   then
    594   tool="/sbin/dracut ${dracuthostonly} -f ${initrdfile} ${version}"   tool="dracut ${dracuthostonly} -f ${initrdfile} ${version}"
    595   else   else
    596   tool="/sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}"   tool="mkinitrd --allow-missing -f ${initrdfile} ${version}"
    597   fi   fi
    598   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"   [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}"
    599   ${tool}   ${tool}
    # Line 666  fi Line 834  fi
    834    
    835  if [[ ${initrd} = make ]]  if [[ ${initrd} = make ]]
    836  then  then
    837   mkinitrd   makeinitrd
    838  elif [[ ${initrd} = remove ]]  elif [[ ${initrd} = remove ]]
    839  then  then
    840   rminitrd   rminitrd
    # Line 679  then Line 847  then
    847  fi  fi
    848    
    849  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1  [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
    850    [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1
    851    [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1
    852  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1  [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1
    853    [[ -n ${extlinuxConfig} ]] && [ -f ${extlinuxConfig} ] && cfgExtlinux=1
    854    
    855  # 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
    856  # 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.
    857  if [[ -n ${ubootDir} ]]  if [[ -n ${ubootDir} ]]
    858  then  then
    859   mountEntry=$(mount | grep ${ubootDir})   if [ -f ${ubootScript} ]
      if [[ -z ${mountEntry} ]]  
    860   then   then
    861   mount ${ubootDevice} ${ubootDir}   cfguBoot=1
    862   mounted=1   else
    863     mountEntry=$(mount | grep ${ubootDir})
    864     if [[ -z ${mountEntry} ]]
    865     then
    866     mount ${ubootDevice} ${ubootDir}
    867     mounted=1
    868     fi
    869     [ -f ${ubootScript} ] && cfguBoot=1
    870   fi   fi
      [ -f ${ubootScript} ] && cfguBoot=1  
    871  fi  fi
    872    
    873  # 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 712  then Line 888  then
    888   update   update
    889  fi  fi
    890    
    891    # if we mounted the U-Boot directory, unmount it.
    892    [[ -n ${mounted} ]] && umount ${ubootDir}
    893    
    894  exit 0  exit 0
    Legend:
    Removed from v.1691  
    changed lines
      Added in v.1803