--- trunk/grubby/new-kernel-pkg	2013/10/21 13:50:31	2242
+++ trunk/grubby/new-kernel-pkg	2014/07/16 10:26:39	2684
@@ -116,6 +116,7 @@
 then
 	liloConfig=""
 	bootPrefix=/boot
+	extlinuxConfig=$(readlink -f /etc/extlinux.conf 2>/dev/null)
 	ubootDir=${UBOOT_DIR:-"/boot"}
 	ubootScript=$ubootDir/${UBOOT_SCR:-"boot.scr"}
 	ubootKList=${UBOOT_KLIST:-"klist.txt"}
@@ -219,8 +220,16 @@
 
 	if [[ -n ${banner} ]]
 	then
-		title="${banner} [ ${version} ]"
-	elif [[ $(read_os_release id) = magellan ]]
+		if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
+		then
+			title=$(echo ${banner} | sed 's/ /_/g')
+		else
+			title="${banner} [ ${version} ]"
+		fi
+	elif [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
+	then
+		title=$(echo ${version} | sed 's/ /_/g')
+	elif [ -f /etc/os-release ]
 	then
 		title="$(read_os_release name) $(read_os_release version_id) [ ${version} ]"
 	elif [ -f /etc/mageversion ]
@@ -274,7 +283,7 @@
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${liloConfig}"
 
 		${grubby} --add-kernel=${kernelImage} ${INITRD} \
-			--copy-default ${makedefault} --title ${version} \
+			--copy-default ${makedefault} --title "${title}" \
 			${mbkernel:+--add-multiboot="${mbkernel}"} ${mbargs:+--mbargs="${mbargs}"} \
 			--args="root=${rootdevice} ${kernargs}" --remove-kernel="TITLE=${version}" \
 			--${liloFlag}
@@ -404,6 +413,7 @@
 				fi
 
 				mv ${tmpKList} ${ubootDir}/${ubootKList}
+				[ -x /sbin/a-b-c ] && /sbin/a-b-c
 			else
 				[[ -n ${verbose} ]] && echo "uImage ${newversion} does not exist!"
 				[ -f ${tmpKList} ] && rm -f ${tmpKList}
@@ -452,7 +462,8 @@
 			--update-kernel=${kernelImage} \
 			${INITRD} \
 			${kernargs:+--args="${kernargs}"} \
-			${removeargs:+--remove-args="${removeargs}"}
+			${removeargs:+--remove-args="${removeargs}"} \
+			${mbkernel:+--add-multiboot="${mbkernel}"}
 	else
 		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
 	fi
@@ -530,6 +541,7 @@
 				[[ -n ${verbose} ]] && echo "copy uInitrd-${version} error, kernel not installed!" && exit
 			fi
 			echo ${version} >> ${ubootDir}/${ubootKList}
+			[ -x /sbin/a-b-c ] && /sbin/a-b-c
 		else
 			[[ -n ${verbose} ]] && echo "cannot make ${version} the default"
 		fi
@@ -586,7 +598,7 @@
 	if [ -d /lib/modules/${version} ]
 	then
 		rm -f /lib/modules/${version}/modules.*.bin \
-			/lib/modules/${version}/modules.{alias|dep|devname|symbols|softdep}
+			/lib/modules/${version}/modules.{alias,dep,devname,symbols,softdep}
 	fi
 }