--- trunk/grubby/new-kernel-pkg	2012/02/18 01:22:03	1752
+++ trunk/grubby/new-kernel-pkg	2012/04/16 17:51:27	1803
@@ -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 ]] || [[ ${ARCH} = armv7hl ]]
+elif [[ ${ARCH} = armv7l ]] || [[ ${ARCH} = armv7hl ]] || [[ ${ARCH} = armv5tel ]]
 then
 	machine=$(grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//')
 	liloConfig=""
@@ -198,12 +225,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} \
@@ -219,12 +249,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} \
@@ -241,12 +274,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} \
@@ -288,12 +324,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} \
@@ -548,7 +587,7 @@
 	fi
 }
 
-mkinitrd()
+makeinitrd()
 {
 	if [[ -n ${dracut} ]]
 	then
@@ -795,7 +834,7 @@
 
 if [[ ${initrd} = make ]]
 then
-	mkinitrd
+	makeinitrd
 elif [[ ${initrd} = remove ]]
 then
 	rminitrd