--- trunk/grubby/new-kernel-pkg 2012/02/18 00:28:45 1710 +++ trunk/grubby/new-kernel-pkg 2012/02/18 00:46:32 1716 @@ -46,11 +46,13 @@ cfgGrub2Efi="" cfgGrub="" cfgLilo="" +cfgExtlinux="" cfguBoot="" runLilo="" grubConfig="" grub2Config="" grub2EfiConfig="" +extlinuxConfig="" ARCH=$(uname -m) @@ -102,6 +104,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" @@ -271,6 +274,28 @@ 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})" + 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() @@ -380,6 +405,15 @@ 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() @@ -492,6 +526,18 @@ 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() @@ -757,6 +803,7 @@ [[ -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.