--- trunk/grubby/new-kernel-pkg	2013/10/21 13:22:57	2238
+++ trunk/grubby/new-kernel-pkg	2013/10/21 13:28:04	2239
@@ -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}" \