--- trunk/grubby/new-kernel-pkg	2013/10/21 13:22:57	2238
+++ trunk/grubby/new-kernel-pkg	2013/10/21 13:35:28	2240
@@ -217,22 +217,23 @@
 		cfgLilo=""
 	fi
 
+	if [[ -n ${banner} ]]
+	then
+		title="${banner} [ ${version} ]"
+	elif [[ $(read_os_release id) = magellan ]]
+	then
+		title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
+	elif [ -f /etc/mageversion ]
+	then
+		title="Magellan Linux $(< /etc/mageversion) [ ${version} ]"
+	else
+		title="Magellan Linux [ ${version} ]"
+	fi
+
 	if [[ -n ${cfgGrub} ]]
 	then
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${grubConfig}"
 
-		if [[ -n ${banner} ]]
-		then
-			title="${banner} [ ${version} ]"
-		elif [ -f /etc/mageversion ]
-		then
-			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} ]"
-		fi
 		${grubby} --grub -c ${grubConfig} \
 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
 			${INITRD} --copy-default ${makedefault} --title "${title}" \
@@ -245,18 +246,6 @@
 	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} ]"
-		elif [[ $(read_os_release id) = magellan ]]
-		then
-			title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
-		else
-			title="Magellan Linux [ ${version} ]"
-		fi
 		${grubby} --grub2 -c ${grub2Config} \
 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
 			${INITRD} --copy-default ${makedefault} --title "${title}" \
@@ -270,18 +259,6 @@
 	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} ]"
-		elif [[ $(read_os_release id) = magellan ]]
-		then
-			title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
-		else
-			title="Magellan Linux [ ${version} ]"
-		fi
 		${grubby} --grub2 -c ${grub2EfiConfig} --efi \
 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
 			${INITRD} --copy-default ${makedefault} --title "${title}" \
@@ -320,18 +297,6 @@
 	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} ]"
-		elif [[ $(read_os_release id) = magellan ]]
-		then
-			title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
-		else
-			title="Magellan Linux [ ${version} ]"
-		fi
 		${grubby} --extlinux -c ${extlinuxConfig} \
 			--add-kernel=${bootPrefix}/${kernelName}-${version} \
 			${INITRD} --copy-default ${makedefault} --title "${title}" \
@@ -642,9 +607,9 @@
 			;;
 
 		--initrdfile*)
-			if echo $1 | grep '=' >/dev/null
+			if [[ $1 == --initrdfile\=* ]]
 			then
-				initrdfile=$(echo $1 | sed 's/^--initrdfile=//')
+				initrdfile=${1#--initrdfile=}
 			else
 				initrdfile=$2
 				shift
@@ -652,9 +617,9 @@
 			;;
 
 		--kernel-args*)
-			if echo $1 | grep '=' >/dev/null
+			if [[ $1 == --kernel-args\=* ]]
 			then
-				kernargs=$(echo $1 | sed 's/^--kernel-args=//')
+				kernargs=${1#--kernel-args=}
 			else
 				kernargs=$2
 				shift
@@ -662,9 +627,9 @@
 			;;
 
 		--remove-args*)
-			if echo $1 | grep '=' >/dev/null
+			if [[ $1 == --remove-args\=* ]]
 			then
-				removeargs=$(echo $1 | sed 's/^--remove-args=//')
+				removeargs=${1#--remove-args=}
 			else
 				removeargs=$2
 				shift
@@ -672,9 +637,9 @@
 			;;
 
 		--banner*)
-			if echo $1 | grep '=' >/dev/null
+			if [[ $1 == --banner\=* ]]
 			then
-				banner=$(echo $1 | sed 's/^--banner=//')
+				banner=${1#--banner=}
 			else
 				banner=$2
 				shift
@@ -682,9 +647,9 @@
 			;;
 
 		--multiboot*)
-			if echo $1 |grep '=' >/dev/null
+			if [[ $1 == --multiboot\=* ]]
 			then
-				mbkernel=$(echo $1 | sed 's/^--multiboot=//')
+				mbkernel=${1#--multiboot=}
 			else
 				# can't really support having an optional second arg here
 				# sorry!
@@ -693,9 +658,9 @@
 			;;
 
 		--mbargs*)
-			if echo $1 |grep '=' >/dev/null
+			if [[ $1 == --mbargs\=* ]]
 			then
-				mbargs=$(echo $1 | sed 's/^--mbargs=//')
+				mbargs=${1#--mbargs=}
 			else
 				mbargs="$2"
 				shift
@@ -714,10 +679,10 @@
 			makedefault="--make-default"
 			;;
 
-		--package)
-			if echo $1 | grep '=' >/dev/null
+		--package*)
+			if [[ $1 == --package\=* ]]
 			then
-				package=$(echo $1 | sed 's/^--package=//')
+				package=${1#--package=}
 			else
 				package=$2
 				shift