--- trunk/grubby/new-kernel-pkg 2012/02/18 00:15:09 1697 +++ trunk/grubby/new-kernel-pkg 2013/10/21 13:22:08 2237 @@ -25,6 +25,32 @@ # along with this program. If not, see . # +read_os_release() +{ + local NAME + local ID + local Version + local Version_ID + local PRETTY_NAME + local ANSI_COLOR + local CPE_NAME + + if [[ -f /etc/os-release ]] + then + source /etc/os-release + + case $1 in + name) echo "${NAME}" ;; + id) echo "${ID}" ;; + version) echo "${Version}" ;; + version_id) echo "${Version_ID}" ;; + pretty_name) echo "${PRETTY_NAME}" ;; + ansi_color) echo "${ANSI_COLOR}" ;; + cpe_name) echo "${CPE_NAME}" ;; + esac + fi +} + PATH=/sbin:/bin:$PATH lilo=/sbin/lilo @@ -46,9 +72,13 @@ cfgGrub2Efi="" cfgGrub="" cfgLilo="" +cfgExtlinux="" cfguBoot="" runLilo="" grubConfig="" +grub2Config="" +grub2EfiConfig="" +extlinuxConfig="" ARCH=$(uname -m) @@ -61,6 +91,7 @@ elif [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]] then liloConfig=/etc/yaboot.conf + grub2Config=/boot/grub/grub.cfg bootPrefix=/boot lilo=/sbin/ybin liloFlag=yaboot @@ -81,16 +112,17 @@ lilo=/sbin/zipl runLilo="yes" isx86="" -elif [[ ${ARCH} = armv7l ]] +elif [[ ${ARCH} =~ armv[5|7].*l ]] then liloConfig="" bootPrefix=/boot - ubootDir=${UBOOT_DIR:-"/boot/uboot"} + ubootDir=${UBOOT_DIR:-"/boot"} ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"} ubootKList=${UBOOT_KLIST:-"klist.txt"} ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"} ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"} ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"} + ubootAddress=${UBOOT_IMGADDR:-"0x00008000"} mounted="" liloFlag="" isx86="" @@ -100,6 +132,7 @@ grubConfig=/boot/grub/grub.conf grub2Config=/boot/grub/grub.cfg grub2EfiConfig=/boot/grub/grub-efi.cfg + extlinuxConfig=/boot/extlinux/extlinux.conf bootPrefix=/boot liloFlag=lilo isx86="yes" @@ -115,8 +148,8 @@ verbose="" makedefault="" package="" -mbkernel="" -mbargs="" +mbkernel="${HYPERVISOR}" +mbargs="${HYPERVISOR_ARGS}" adddracutargs="" addplymouthinitrd="" @@ -173,6 +206,10 @@ # get the root filesystem to use rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab) + if [[ -z $rootdevice ]] + then + rootdevice=$(grep -o -P "(?<=root=)\S+" /proc/cmdline) + fi if [[ -n ${mbkernel} ]] && [[ -n ${cfgLilo} ]] && [[ ${liloFlag} != elilo ]] then @@ -186,14 +223,18 @@ if [[ -n ${banner} ]] then - title="${banner} (${version})" + title="${banner} [ ${version} ]" elif [ -f /etc/mageversion ] then - title="Magellan Linux $(< /etc/mageversion) (${version})" + 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})" + title="Magellan Linux [ ${version} ]" fi - ${grubby} --grub --add-kernel=${bootPrefix}/${kernelName}-${version} \ + ${grubby} --grub -c ${grubConfig} \ + --add-kernel=${bootPrefix}/${kernelName}-${version} \ ${INITRD} --copy-default ${makedefault} --title "${title}" \ ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \ --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}" @@ -206,14 +247,17 @@ if [[ -n ${banner} ]] then - title="${banner} (${version})" + title="${banner} [ ${version} ]" elif [ -f /etc/mageversion ] then - title="Magellan Linux $(< /etc/mageversion) (${version})" + 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})" + title="Magellan Linux [ ${version} ]" fi - ${grubby} --grub2 -c ${grub2Cfg} \ + ${grubby} --grub2 -c ${grub2Config} \ --add-kernel=${bootPrefix}/${kernelName}-${version} \ ${INITRD} --copy-default ${makedefault} --title "${title}" \ ${mbkernel:+--add-multiboot="${mbkernel}"} \ @@ -228,14 +272,17 @@ if [[ -n ${banner} ]] then - title="${banner} (${version})" + title="${banner} [ ${version} ]" elif [ -f /etc/mageversion ] then - title="Magellan Linux $(< /etc/mageversion) (${version})" + 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})" + title="Magellan Linux [ ${version} ]" fi - ${grubby} --grub2 -c ${grub2EfiCfg} \ + ${grubby} --grub2 -c ${grub2EfiConfig} --efi \ --add-kernel=${bootPrefix}/${kernelName}-${version} \ ${INITRD} --copy-default ${makedefault} --title "${title}" \ ${mbkernel:+--add-multiboot="${mbkernel}"} \ @@ -268,6 +315,31 @@ else [[ -n ${verbose} ]] && echo "${liloConfig} does not exist, not running grubby" fi + + if [[ -n ${cfgExtlinux} ]] + then + [[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}" + + 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 + ${grubby} --extlinux -c ${extlinuxConfig} \ + --add-kernel=${bootPrefix}/${kernelName}-${version} \ + ${INITRD} --copy-default ${makedefault} --title "${title}" \ + ${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \ + --args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${title}" + else + [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux" + fi } remove() @@ -283,7 +355,8 @@ if [[ -n ${cfgGrub} ]] then [[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}" - ${grubby} --grub --remove-kernel=${bootPrefix}/${kernelName}-${version} + ${grubby} --grub -c ${grubConfig} \ + --remove-kernel=${bootPrefix}/${kernelName}-${version} else [[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97" fi @@ -298,7 +371,7 @@ if [[ -n ${cfgGrub2Efi} ]] then [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}" - ${grubby} --grub2 -c ${grub2EfiConfig} \ + ${grubby} --grub2 -c ${grub2EfiConfig} --efi \ --remove-kernel=${bootPrefix}/${kernelName}-${version} else [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI" @@ -331,7 +404,7 @@ then tmpKList=$(mktemp ${ubootDir}/${ubootKList}.XXXX) curversion=$(tail -n1 ${ubootDir}/${ubootKList}) - sed "/${version}/d" ${ubootDir}/${ubootKList} > ${tmpKList} + sed "/$version$/d" ${ubootDir}/${ubootKList} > ${tmpKList} newversion=$(tail -n1 ${tmpKList}) if [ -f ${ubootDir}/uImage-${newversion} ] && [ -f ${ubootDir}/uInitrd-${newversion} ] then @@ -371,11 +444,20 @@ [ -f ${tmpKList} ] && rm -f ${tmpKList} fi else - [[ -n ${verbose} ]] && echo "No previous kernel version. uBoot images not removed!" + [[ -n ${verbose} ]] && echo "No previous kernel version. U-Boot images not removed!" fi else [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not modifying ${ubootDir}" fi + + if [[ -n ${cfgExtlinux} ]] + then + [[ -n ${verbose} ]] && echo "removing ${version} from ${extlinuxConfig}" + ${grubby} --extlinux -c ${extlinuxConfig} \ + --remove-kernel=${bootPrefix}/${kernelName}-${version} + else + [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux" + fi } update() @@ -401,7 +483,8 @@ if [[ -n ${cfgGrub} ]] then [[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}" - ${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \ + ${grubby} --grub -c ${grubConfig} \ + --update-kernel=${bootPrefix}/${kernelName}-${version} \ ${INITRD} \ ${kernargs:+--args="${kernargs}"} \ ${removeargs:+--remove-args="${removeargs}"} @@ -424,7 +507,7 @@ if [[ -n ${cfgGrub2Efi} ]] then [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}" - ${grubby} --grub2 -c ${grub2EfiConfig} \ + ${grubby} --grub2 -c ${grub2EfiConfig} --efi \ --update-kernel=${bootPrefix}/${kernelName}-${version} \ ${INITRD} \ ${kernargs:+--args="${kernargs}"} \ @@ -461,8 +544,9 @@ [[ -n ${verbose} ]] && echo "adding $version to ${ubootDir}..." [[ -n ${verbose} ]] && echo "creating uImage-${version}" - mkimage -A arm -O linux -T kernel -C none -a 0x80008000 -e 0x80008000 \ - -n ${version} -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version} + mkimage -A arm -O linux -T kernel -C none -a ${ubootAddress} \ + -e ${ubootAddress} -n ${version} \ + -d ${bootPrefix}/${kernelName}-${version} ${ubootDir}/uImage-${version} [[ -n ${verbose} ]] && echo "creating uInitrd-${version}" mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 \ @@ -487,15 +571,27 @@ else [[ -n ${verbose} ]] && echo "${ubootScript} does not exist, not setting up ${ubootDir}" fi + + if [[ -n ${cfgExtlinux} ]] + then + [[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}" + ${grubby} --extlinux -c ${extlinuxConfig} \ + --update-kernel=${bootPrefix}/${kernelName}-${version} \ + ${INITRD} \ + ${kernargs:+--args="${kernargs}"} \ + ${removeargs:+--remove-args="${removeargs}"} + else + [[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby" + fi } -mkinitrd() +makeinitrd() { if [[ -n ${dracut} ]] then - tool="/sbin/dracut ${dracuthostonly} -f ${initrdfile} ${version}" + tool="dracut ${dracuthostonly} -f ${initrdfile} ${version}" else - tool="/sbin/mkinitrd --allow-missing -f ${initrdfile} ${version}" + tool="mkinitrd --allow-missing -f ${initrdfile} ${version}" fi [[ -n ${verbose} ]] && echo "creating initrd ${initrdfile} using ${version}" ${tool} @@ -704,17 +800,45 @@ # add dracut i18n, keyboard and plymouth kernel args if requested if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]] then - [ -r /etc/conf.d/keymap ] && . /etc/conf.d/keymap - [ -r /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont - - if [[ -n ${KEYMAP} ]] + if [ -r /etc/vconsole.conf ] then - kernargs="${kernargs} KEYTABLE=${KEYMAP}" + . /etc/vconsole.conf + + for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE + do + val=$(eval echo \$$i) + [[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}" + done + else + if [ -r /etc/conf.d/consolefont ] + then + . /etc/conf.d/consolefont + + if [[ -n ${CONSOLEFONT} ]] + then + kernargs="${kernargs} SYSFONT=${CONSOLEFONT}" + fi + fi + + if [ -r /etc/conf.d/keymap ] + then + . /etc/conf.d/keymap + + if [[ -n ${KEYMAP} ]] + then + kernargs="${kernargs} KEYTABLE=${KEYMAP}" + fi + fi fi - if [[ -n ${CONSOLEFONT} ]] + if [ -r /etc/locale.conf ] then - kernargs="${kernargs} SYSFONT=${CONSOLEFONT}" + . /etc/locale.conf + + if [[ -n ${LANG} ]] + then + kernargs="${kernargs} LANG=${LANG}" + fi fi fi @@ -736,7 +860,7 @@ if [[ ${initrd} = make ]] then - mkinitrd + makeinitrd elif [[ ${initrd} = remove ]] then rminitrd @@ -752,18 +876,39 @@ [[ -n ${grub2Config} ]] && [ -f ${grub2Config} ] && cfgGrub2=1 [[ -n ${grub2EfiConfig} ]] && [ -f ${grub2EfiConfig} ] && cfgGrub2Efi=1 [[ -n ${liloConfig} ]] && [ -f ${liloConfig} ] && cfgLilo=1 +[[ -n ${extlinuxConfig} ]] && [ -f ${extlinuxConfig} ] && cfgExtlinux=1 -# if we have a uBoot directory, check if it is mounted. -# if not, mount it. Then check if a boot script exists. +# if we have a U-Boot directory, but no boot script, check if the directory +# is mounted. If not, mount it, and then check if a boot script exists. if [[ -n ${ubootDir} ]] then - mountEntry=$(mount | grep ${ubootDir}) - if [[ -z ${mountEntry} ]] + if [ -f ${ubootScript} ] then - mount ${ubootDevice} ${ubootDir} - mounted=1 + cfguBoot=1 + else + mountEntry=$(mount | grep ${ubootDir}) + if [[ -z ${mountEntry} ]] + then + mount ${ubootDevice} ${ubootDir} + mounted=1 + fi + [ -f ${ubootScript} ] && cfguBoot=1 + fi +fi + +# if we're using U-Boot, check if the default load address should change +if [[ -n ${cfguBoot} ]] && [[ -z ${UBOOT_IMGADDR} ]] +then + [[ ${version} =~ .([^.]*)$ ]] + platform=${BASH_REMATCH[1]} + # A few platforms use an alternate kernel load address + if [[ ${platform} = omap ]] + then + ubootAddress=0x80008000 + elif [[ ${platform} = imx ]] + then + ubootAddress=0x90008000 fi - [ -f ${ubootScript} ] && cfguBoot=1 fi # if we have a lilo config on an x86 box, see if the default boot loader @@ -784,4 +929,7 @@ update fi +# if we mounted the U-Boot directory, unmount it. +[[ -n ${mounted} ]] && umount ${ubootDir} + exit 0