--- trunk/grubby/new-kernel-pkg	2012/02/18 00:59:04	1728
+++ trunk/grubby/new-kernel-pkg	2012/07/02 12:58:29	1843
@@ -25,6 +25,32 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+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
@@ -65,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
@@ -85,7 +112,7 @@
 	lilo=/sbin/zipl
 	runLilo="yes"
 	isx86=""
-elif [[ ${ARCH} = armv7l ]]
+elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
 then
 	liloConfig=""
 	bootPrefix=/boot
@@ -98,6 +125,18 @@
 	mounted=""
 	liloFlag=""
 	isx86=""
+	if [[ -z ${UBOOT_IMGADDR} ]]
+	then
+		machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
+		if [ "${machine}" == "OMAP3 Beagle Board" ] || [ "${machine}" == "OMAP4 Panda board" ]
+		then
+			ubootAddress=0x80008000
+		else
+			ubootAddress=0x00008000
+		fi
+	else
+		ubootAddress="${UBOOT_IMGADDR}"
+	fi
 else
 	# this leaves i?86 and x86_64
 	liloConfig=/etc/lilo.conf
@@ -191,12 +230,15 @@
 
 		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 -c ${grubConfig} \
 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
@@ -212,12 +254,15 @@
 
 		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 ${grub2Config} \
 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
@@ -234,12 +279,15 @@
 
 		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 ${grub2EfiConfig} \
 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
@@ -281,12 +329,15 @@
 
 		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} --extlinux -c ${extlinuxConfig} \
 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
@@ -400,7 +451,7 @@
 				[ -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}"
@@ -500,8 +551,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 \
@@ -540,13 +592,13 @@
 	fi
 }
 
-mkinitrd()
+makeinitrd()
 {
 	if [[ -n ${dracut} ]]
 	then
 		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}
@@ -787,7 +839,7 @@
 
 if [[ ${initrd} = make ]]
 then
-	mkinitrd
+	makeinitrd
 elif [[ ${initrd} = remove ]]
 then
 	rminitrd
@@ -805,17 +857,22 @@
 [[ -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
@@ -836,4 +893,7 @@
 	update
 fi
 
+# if we mounted the U-Boot directory, unmount it.
+[[ -n ${mounted} ]] && umount ${ubootDir}
+
 exit 0