--- trunk/grubby/new-kernel-pkg	2014/07/16 10:26:39	2684
+++ trunk/grubby/new-kernel-pkg	2014/07/16 10:38:09	2685
@@ -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 [ -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
@@ -614,6 +622,16 @@
 			initrd="remove"
 			;;
 
+		--devtree*)
+			if [[ $1 == --devtree\=* ]]
+			then
+				devtreefile="${1#--devtreefile=}"
+			else
+				devtreefile="$2"
+				shift
+			fi
+			;;
+
 		--dracut)
 			dracut=--dracut
 			;;