--- trunk/grubby/new-kernel-pkg	2014/07/16 09:48:55	2681
+++ trunk/grubby/new-kernel-pkg	2014/07/16 10:50:58	2699
@@ -145,6 +145,7 @@
 dracut=""
 dracuthostonly=""
 initrdfile=""
+devtreefile=""
 moddep=""
 verbose=""
 makedefault=""
@@ -162,7 +163,7 @@
 	echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
 	echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
 	echo "       [--add-plymouth-initrd]" >&2
-	echo "       [--host-only]" >&2
+	echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2
 	echo "       <--install | --remove | --update> <kernel-version>" >&2
 	echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
 	exit 1
@@ -189,6 +190,13 @@
 		fi
 	fi
 
+	DEVTREE=""
+	if [[ x${devtreefile} != x ]] && [ -f ${devtreefile} ]
+	then
+		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
+		DEVTREE="--devtree ${devtreefile}"
+	fi
+
 	# FIXME: is this a good heuristic to find out if we're on iSeries?
 	if [ -d /proc/iSeries ]
 	then
@@ -220,7 +228,15 @@
 
 	if [[ -n ${banner} ]]
 	then
-		title="${banner} [ ${version} ]"
+		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} ]"
@@ -261,7 +277,7 @@
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${grub2EfiConfig}"
 
 		${grubby} --grub2 -c ${grub2EfiConfig} --efi \
-			--add-kernel=${kernelImage} \
+			--add-kernel=${kernelImage} ${DEVTREE} \
 			${INITRD} --copy-default ${makedefault} --title "${title}" \
 			${mbkernel:+--add-multiboot="${mbkernel}"} \
 			${mbargs:+--mbargs="${mbargs}"} \
@@ -275,7 +291,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}
@@ -606,6 +622,16 @@
 			initrd="remove"
 			;;
 
+		--devtree*)
+			if [[ $1 == --devtree\=* ]]
+			then
+				devtreefile="${1#--devtreefile=}"
+			else
+				devtreefile="$2"
+				shift
+			fi
+			;;
+
 		--dracut)
 			dracut=--dracut
 			;;