--- trunk/grubby/new-kernel-pkg	2012/02/17 23:10:15	1691
+++ trunk/grubby/new-kernel-pkg	2012/02/18 11:05:14	1756
@@ -42,11 +42,17 @@
 [ -f /etc/conf.d/grubby ] && . /etc/conf.d/grubby
 [ -f /etc/conf.d/grubby-uboot ] && . /etc/conf.d/grubby-uboot
 
+cfgGrub2=""
+cfgGrub2Efi=""
 cfgGrub=""
 cfgLilo=""
+cfgExtlinux=""
 cfguBoot=""
 runLilo=""
 grubConfig=""
+grub2Config=""
+grub2EfiConfig=""
+extlinuxConfig=""
 
 ARCH=$(uname -m)
 
@@ -79,8 +85,9 @@
 	lilo=/sbin/zipl
 	runLilo="yes"
 	isx86=""
-elif [[ ${ARCH} = armv7l ]]
+elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]]
 then
+	machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
 	liloConfig=""
 	bootPrefix=/boot
 	ubootDir=${UBOOT_DIR:-"/boot/uboot"}
@@ -92,10 +99,19 @@
 	mounted=""
 	liloFlag=""
 	isx86=""
+	if [[ ${machine} == "OMAP3 Beagle Board" ]] || [[ ${machine} == "OMAP4 Panda board" ]]
+	then
+		ubootAddress=0x80008000
+	else
+		ubootAddress=0x00008000
+	fi
 else
 	# this leaves i?86 and x86_64
 	liloConfig=/etc/lilo.conf
 	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"
@@ -111,8 +127,8 @@
 verbose=""
 makedefault=""
 package=""
-mbkernel=""
-mbargs=""
+mbkernel="${HYPERVISOR}"
+mbargs="${HYPERVISOR_ARGS}"
 adddracutargs=""
 addplymouthinitrd=""
 
@@ -130,15 +146,6 @@
 	exit 1
 }
 
-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
-}
-
 install()
 {
 	# XXX kernel should be able to be specified also (or work right on ia64)
@@ -176,9 +183,6 @@
 		return
 	fi
 
-	# Run grub2's configuration update in parallel, if it is installed
-	run_grub2
-
 	# get the root filesystem to use
 	rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
 
@@ -201,12 +205,57 @@
 		else
 			title="Magellan Linux (${version})"
 		fi
-		${grubby} --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}"
 	else
-		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
+		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
+	fi
+	if [[ -n ${cfgGrub2} ]]
+	then
+		[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2Config}"
+
+		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} --grub2 -c ${grub2Config} \
+			--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 "${grub2Config} does not exist, not running grubby for grub 2"
+	fi
+	if [[ -n ${cfgGrub2Efi} ]]
+	then
+		[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
+
+		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} --grub2 -c ${grub2EfiConfig} \
+			--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 "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
 	fi
 
 	if [[ -n ${cfgLilo} ]]
@@ -232,6 +281,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()
@@ -244,15 +315,29 @@
 		return
 	fi
 
-	# Run grub2's configuration update in parallel, if it is installed
-	run_grub2
-
 	if [[ -n ${cfgGrub} ]]
 	then
 		[[ -n ${verbose} ]] && echo "removing ${version} from ${grubConfig}"
-		${grubby} --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"
+		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
+	fi
+	if [[ -n ${cfgGrub2} ]]
+	then
+		[[ -n ${verbose} ]] && echo "removing ${version} from ${grub2Config}"
+		${grubby} --grub2 -c ${grub2Config} \
+			--remove-kernel=${bootPrefix}/${kernelName}-${version}
+	else
+		[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
+	fi
+	if [[ -n ${cfgGrub2Efi} ]]
+	then
+		[[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
+		${grubby} --grub2 -c ${grub2EfiConfig} \
+			--remove-kernel=${bootPrefix}/${kernelName}-${version}
+	else
+		[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
 	fi
 
 	if [[ -n ${cfgLilo} ]]
@@ -322,11 +407,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()
@@ -349,13 +443,11 @@
 		fi
 	fi
 
-	# Run grub2's configuration update in parallel, if it is installed
-	run_grub2
-
 	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}"}
@@ -363,6 +455,30 @@
 		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
 	fi
 
+	if [[ -n ${cfgGrub2} ]]
+	then
+		[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2Config}"
+		${grubby} --grub2 -c ${grub2Config} \
+			--update-kernel=${bootPrefix}/${kernelName}-${version} \
+			${INITRD} \
+			${kernargs:+--args="${kernargs}"} \
+			${removeargs:+--remove-args="${removeargs}"}
+	else
+		[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
+	fi
+
+	if [[ -n ${cfgGrub2Efi} ]]
+	then
+		[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
+		${grubby} --grub2 -c ${grub2EfiConfig} \
+			--update-kernel=${bootPrefix}/${kernelName}-${version} \
+			${INITRD} \
+			${kernargs:+--args="${kernargs}"} \
+			${removeargs:+--remove-args="${removeargs}"}
+	else
+		[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
+	fi
+
 	if [[ -n ${cfgLilo} ]]
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
@@ -391,8 +507,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 \
@@ -417,15 +534,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}
@@ -666,7 +795,7 @@
 
 if [[ ${initrd} = make ]]
 then
-	mkinitrd
+	makeinitrd
 elif [[ ${initrd} = remove ]]
 then
 	rminitrd
@@ -679,19 +808,27 @@
 fi
 
 [[ -n ${grubConfig} ]] && [ -f ${grubConfig} ] && cfgGrub=1
+[[ -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
-	[ -f ${ubootScript} ] && cfguBoot=1
 fi
 
 # if we have a lilo config on an x86 box, see if the default boot loader
@@ -712,4 +849,7 @@
 	update
 fi
 
+# if we mounted the U-Boot directory, unmount it.
+[[ -n ${mounted} ]] && umount ${ubootDir}
+
 exit 0