--- trunk/mkinitrd-magellan/grubby/new-kernel-pkg	2009/10/28 13:29:18	925
+++ trunk/mkinitrd-magellan/grubby/new-kernel-pkg	2011/05/27 17:31:15	1305
@@ -101,7 +101,7 @@
 {
 	echo "Usage: $(basename $0) [-v] [--mkinitrd] [--rminitrd]" >&2
 	echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
-	echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2 
+	echo "       [--kernel-args=<args>] [--remove-args=<args>]" >&2
 	echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
 	echo "       [--mbargs=mbargs] [--make-default]" >&2
 	echo "       <--install | --remove | --update> <kernel-version>" >&2
@@ -109,6 +109,15 @@
 	exit 1
 }
 
+run_grub2()
+{
+	if [ -d /boot/grub2 -a -x /sbin/grub2-mkconfig ]
+	then
+		cp /boot/grub2/grub.cfg /boot/grub2/grub.cfg.old
+		/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
+	fi
+}
+
 install()
 {
 	# XXX kernel should be able to be specified also (or work right on ia64)
@@ -141,6 +150,9 @@
 		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)
 
@@ -184,7 +196,7 @@
 		if [[ -n ${runLilo} ]]
 		then
 			[[ -n ${verbose} ]] && echo "running ${lilo}"
-			if [ ! -x $lilo ]
+			if [ ! -x ${lilo} ]
 			then
 				[[ -n ${verbose} ]] && echo "${lilo} does not exist"
 			else
@@ -206,6 +218,9 @@
 		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}"
@@ -217,8 +232,7 @@
 	if [[ -n ${cfgLilo} ]]
 	then
 		[[ -n ${verbose} ]] && echo "removing ${version} from ${liloConfig}"
-		${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version}    \
-			--${liloFlag}
+		${grubby} --remove-kernel=${bootPrefix}/${kernelName}-${version} --${liloFlag}
 
 		if [[ -n ${runLilo} ]]
 		then
@@ -237,10 +251,27 @@
 
 update()
 {
+	if [ ! -f ${bootPrefix}/${kernelName}-${version} ]
+	then
+		[[ -n ${verbose} ]] && echo "kernel for ${version} does not exist, not running grubby"
+		return
+	fi
+
+	INITRD=""
+	if [ -f ${initrdfile} ]
+	then
+		[[ -n ${verbose} ]] && echo "found ${initrdfile} and using it with grubby"
+		INITRD="--initrd ${initrdfile}"
+	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} \
+			${INITRD} \
 			${kernargs:+--args="${kernargs}"} \
 			${removeargs:+--remove-args="${removeargs}"}
 	else
@@ -251,6 +282,7 @@
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${liloConfig}"
 		${grubby} --update-kernel=${bootPrefix}/${kernelName}-${version} \
+			${INITRD} \
 			${kernargs:+--args="${kernargs}"} \
 			${removeargs:+--remove-args="${removeargs}"} \
 			--${liloFlag}
@@ -335,7 +367,7 @@
 		--remove-args*)
 			if echo $1 | grep '=' >/dev/null
 			then
-			removeargs=$(echo $1 | sed 's/^--remove-args=//')
+				removeargs=$(echo $1 | sed 's/^--remove-args=//')
 			else
 				removeargs=$2
 				shift
@@ -433,7 +465,7 @@
 
 kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)
 
-# kernel image for 2.4 is vmlinux
+# kernel image for 2.4 is kernel
 if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
 then
 	if [[ ${kernelmajor} = 2.4 ]]