--- trunk/grubby/new-kernel-pkg	2016/06/30 10:06:57	2971
+++ trunk/grubby/new-kernel-pkg	2016/06/30 10:17:00	2972
@@ -165,7 +165,7 @@
 	echo "       [--banner=<banner>] [--multiboot=multiboot]" >&2
 	echo "       [--mbargs=mbargs] [--make-default] [--add-dracut-args]" >&2
 	echo "       [--add-plymouth-initrd]" >&2
-	echo "       [--host-only] [--devtree=<devicetree.dtb>]" >&2
+	echo "       [--host-only] [--devtree=<devicetree.dtb>] [--devtreedir=</devicetree/path/>]" >&2
 	echo "       <--install | --remove | --update> <kernel-version>" >&2
 	echo "       (ex: $(basename $0) --mkinitrd --depmod --install 2.4.7-2)" >&2
 	exit 1
@@ -236,12 +236,19 @@
 	fi
 
 	DEVTREE=""
-	if [[ x${devtreefile} != x ]] && [ -f "${devtreefile}" ]
+	if [[ -n ${devtreefile} ]] && [ -f ${devtreefile} ]
 	then
 		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
 		DEVTREE="--devtree ${devtreefile}"
 	fi
 
+	DEVTREEDIR=""
+	if [[ -n ${devtreedir} ]] && [ -d ${devtreedir} ]
+	then
+		[ -n ${verbose} ] && echo "found ${devtreedir} and using it with grubby"
+		DEVTREEDIR="--devtreedir ${devtreedir}"
+	fi
+
 	# FIXME: is this a good heuristic to find out if we're on iSeries?
 	if [ -d /proc/iSeries ]
 	then
@@ -352,7 +359,8 @@
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
 
 		ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
-			${DEVTREE} ${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
+			${DEVTREEDIR} ${DEVTREE} \
+			${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
 			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
 			${mbargs:+--mbargs=\"${mbargs}\"} \
 			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
@@ -506,12 +514,19 @@
 	fi
 
 	DEVTREE=""
-	if [[ x${devtreefile} != x ]] && [ -f ${devtreefile} ]
+	if [[ -n ${devtreefile} ]] && [ -f ${devtreefile} ]
 	then
 		[[ -n ${verbose} ]] && echo "found ${devtreefile} and using it with grubby"
 		DEVTREE="--devtree ${devtreefile}"
 	fi
 
+	DEVTREEDIR=""
+	if [[ -n ${devtreedir} ]] && [ -d ${devtreedir} ]
+	then
+		[[ -n ${verbose} ]] && echo "found ${devtreedir} and using it with grubby"
+		DEVTREEDIR="--devtreedir ${devtreedir}"
+	fi
+
 	if [[ -n ${cfgGrub} ]]
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${grubConfig}"
@@ -614,7 +629,7 @@
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
 		ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
-			${DEVTREE} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
+			${DEVTREE} ${DEVTREEDIR} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
 			${removeargs:+--remove-args=\"${removeargs}\"} \
 			--title=\"${title}\${debugtitle}\""
 		rungrubby --debug ${ARGS}
@@ -693,6 +708,16 @@
 				shift
 			fi
 			;;
+
+		--devtreedir*)
+			if [[ $1 == --devtreedir\=* ]]
+			then
+				devtreedir=${1#--devtreedir=}
+			else
+				devtreedir=$2
+				shift
+			fi
+			;;
 
 		--dracut)
 			dracut=--dracut