--- trunk/grubby/new-kernel-pkg	2016/06/29 14:45:50	2964
+++ trunk/grubby/new-kernel-pkg	2017/07/06 12:17:30	3045
@@ -155,7 +155,7 @@
 mbargs="${HYPERVISOR_ARGS}"
 adddracutargs=""
 addplymouthinitrd=""
-DEBUGARG="systemd.debug"
+DEBUGARG="systemd.log_level=debug systemd.log_target=kmsg"
 
 usage()
 {
@@ -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
@@ -177,11 +177,16 @@
 	then
 		[[ ${MAKEDEBUG} != yes ]] && return 0
 		[[ -n ${verbose} ]] && echo "- First, making a debug entry."
-		declare -x debugtitle=" with debugging"
+		if [[ ${ARCH} = s390 ]] || [[ ${ARCH} = s390x ]]
+		then
+			declare -x debugtitle="_with_debugging"
+		else
+			declare -x debugtitle=" with debugging"
+		fi
 		declare -x debugargs="${DEBUGARG}"
 		shift
 	else
-		[[ -n ${verbose} ] && echo "- Making a normal entry."
+		[[ -n ${verbose} ]] && echo "- Making a normal entry."
 	fi
 	$(eval $grubby $@)
 	export -n debugargs
@@ -236,12 +241,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
@@ -283,8 +295,8 @@
 			--title=\"${title}\${debugtitle}\" --copy-default \
 			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
 			--remove-kernel=\"TITLE=${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS} ${makedefault}
+		rungrubby --debug ${ARGS} --set-index=1
 	else
 		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby for grub 0.97"
 	fi
@@ -298,8 +310,8 @@
 			${mbargs:+--mbargs=\"${mbargs}\"} \
 			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
 			--remove-kernel=\"TITLE=${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS} ${makedefault}
+		rungrubby --debug ${ARGS} --set-index=1
 	else
 		[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby for grub 2"
 	fi
@@ -314,8 +326,8 @@
 			${mbargs:+--mbargs=\"${mbargs}\"} \
 			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
 			--remove-kernel=\"TITLE=${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS} ${makedefault}
+		rungrubby --debug ${ARGS} --set-index=1
 	else
 		[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby for grub 2 with UEFI"
 	fi
@@ -330,8 +342,8 @@
 			${mbargs:+--mbargs=\"${mbargs}\"} \
 			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
 			--remove-kernel=\"TITLE=${version}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS} ${makedefault}
+		rungrubby --debug ${ARGS} --set-index=1
 
 		if [[ -n ${runLilo} ]]
 		then
@@ -352,13 +364,14 @@
 		[[ -n ${verbose} ]] && echo "adding ${version} to ${extlinuxConfig}"
 
 		ARGS="--extlinux -c ${extlinuxConfig} --add-kernel=${kernelImage} \
+			${DEVTREEDIR} ${DEVTREE} \
 			${INITRD} --copy-default --title \"${title}\${debugtitle}\" \
 			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
 			${mbargs:+--mbargs=\"${mbargs}\"} \
 			--args=\"root=${rootdevice} ${kernargs} \${debugargs}\" \
 			--remove-kernel=\"TITLE=${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS} ${makedefault}
+		rungrubby --debug ${ARGS} --set-index=1
 	else
 		[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby for extlinux"
 	fi
@@ -505,6 +518,20 @@
 		fi
 	fi
 
+	DEVTREE=""
+	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}"
@@ -513,8 +540,8 @@
 			${removeargs:+--remove-args=\"${removeargs}\"} \
 			${mbkernel:+--add-multiboot=\"${mbkernel}\"} \
 			--title=\"${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS}
+		rungrubby --debug ${ARGS}
 	else
 		[[ -n ${verbose} ]] && echo "${grubConfig} does not exist, not running grubby"
 	fi
@@ -526,8 +553,8 @@
 			${kernargs:+--args=\"${kernargs}\"} \
 			${removeargs:+--remove-args=\"${removeargs}\"} \
 			--title=\"${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS}
+		rungrubby --debug ${ARGS}
 	else
 		[[ -n ${verbose} ]] && echo "${grub2Config} does not exist, not running grubby"
 	fi
@@ -539,8 +566,8 @@
 			${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
 			${removeargs:+--remove-args=\"${removeargs}\"} \
 			--title=\"${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS}
+		rungrubby --debug ${ARGS}
 	else
 		[[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby"
 	fi
@@ -552,8 +579,8 @@
 			${kernargs:+--args=\"${kernargs}\"} \
 			${removeargs:+--remove-args=\"${removeargs}\"} \
 			--title=\"${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS}
+		rungrubby --debug ${ARGS}
 
 		if [[ -n ${runLilo} ]]
 		then
@@ -607,11 +634,11 @@
 	then
 		[[ -n ${verbose} ]] && echo "updating ${version} from ${extlinuxConfig}"
 		ARGS="--extlinux -c ${extlinuxConfig} --update-kernel=${kernelImage} \
-			${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
+			${DEVTREE} ${DEVTREEDIR} ${INITRD} ${kernargs:+--args=\"${kernargs}\"} \
 			${removeargs:+--remove-args=\"${removeargs}\"} \
 			--title=\"${title}\${debugtitle}\""
-		rungrubby --debug ${ARGS}
 		rungrubby ${ARGS}
+		rungrubby --debug ${ARGS}
 	else
 		[[ -n ${verbose} ]] && echo "${extlinuxConfig} does not exist, not running grubby"
 	fi
@@ -657,6 +684,14 @@
 	fi
 }
 
+# kernel image for 2.4 is kernel
+if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
+then
+	if [[ ${kernelmajor} = 2.4 ]]
+	then
+		kernelName=kernel
+	fi
+fi
 
 while [ $# -gt 0 ]
 do
@@ -679,6 +714,16 @@
 			fi
 			;;
 
+		--devtreedir*)
+			if [[ $1 == --devtreedir\=* ]]
+			then
+				devtreedir=${1#--devtreedir=}
+			else
+				devtreedir=$2
+				shift
+			fi
+			;;
+
 		--dracut)
 			dracut=--dracut
 			;;
@@ -794,6 +839,16 @@
 			fi
 			;;
 
+		--kernel-name*)
+			if [[ $1 == --kernel-name\=* ]]
+			then
+				kernelName=${1#--kernel-name=}
+			else
+				kernelName="$2"
+				shift
+			fi
+			;;
+
 		-v)
 			verbose=-v
 			;;
@@ -832,15 +887,6 @@
 
 kernelmajor=$(echo ${kernel} | cut -d . -f 1,2)
 
-# kernel image for 2.4 is kernel
-if [[ ${ARCH} = ppc64 ]] || [[ ${ARCH} = ppc ]]
-then
-	if [[ ${kernelmajor} = 2.4 ]]
-	then
-		kernelName=kernel
-	fi
-fi
-
 [[ ${kernelImage} ]] || kernelImage="${bootPrefix}/${kernelName}-${version}"
 
 # set the initrd file based on arch; ia64 is the only currently known oddball
@@ -861,49 +907,40 @@
 fi
 [[ -n ${verbose} ]] && echo "initrdfile is ${initrdfile}"
 
-# add dracut i18n, keyboard and plymouth kernel args if requested
-if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
+if [[ ${ARCH} =~ armv[5|7].*l ]]
 then
-	if [ -r /etc/vconsole.conf ]
+	if [[ -z ${SHIPSDTB} ]] || [[ ${SHIPSDTB} != yes ]]
 	then
-		. /etc/vconsole.conf
-
-		for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
-		do 
-			val=$(eval echo \$$i)
-			[[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
-		done
-	else
-		if [ -r /etc/conf.d/consolefont ]
+		if [[ -n ${dtbfile} ]] && [ -f ${bootPrefix}/dtb-${version}/${dtbfile} ]
 		then
-			. /etc/conf.d/consolefont
-
-			if [[ -n ${CONSOLEFONT} ]]
-			then
-				kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
-			fi
-		fi
-
-		if  [ -r /etc/conf.d/keymap ]
+			devtreefile="${bootPrefix}/dtb-${version}/${dtbfile}"
+			[[ -n ${verbose} ]] && echo "devtreefile is ${devtreefile}"
+		elif [ -d ${bootPrefix}/dtb-${version}/ ]
 		then
-			. /etc/conf.d/keymap 
-
-			if [[ -n ${KEYMAP} ]]
-			then
-				kernargs="${kernargs} KEYTABLE=${KEYMAP}"
-			fi
+			devtreedir="${bootPrefix}/dtb-${version}/"
+			[[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
 		fi
 	fi
+fi
+[[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
 
-	if [ -r /etc/locale.conf ]
-	then
-		. /etc/locale.conf
+# add dracut kernel args if requested
+if [[ -n ${dracut} ]] && [[ -n ${adddracutargs} ]]
+then
+	[ -r /etc/vconsole.conf ] && . /etc/vconsole.conf
+	[ -r /etc/locale.conf ] && . /etc/locale.conf
 
-		if [[ -n ${LANG} ]]
-		then
-			kernargs="${kernargs} LANG=${LANG}"
-		fi
-	fi
+	while read opt rd_opt
+	do
+		[ -n "${!opt}" ] && kernargs="$kernargs $rd_opt=\"${!opt}\""
+	done <<< 'KEYMAP	rd.vconsole.keymap
+			FONT	rd.vconsole.font
+			FONT_MAP	rd.vconsole.font.map
+			FONT_UNIMAP	rd.vconsole.font.unimap
+			UNICODE	rd.vconsole.font.unicode
+			EXT_KEYMAP	rd.vconsole.keymap.ext
+			LANG	rd.locale.LANG
+			LC_ALL	rd.locale.LC_ALL'
 fi
 
 # set this as the default if we have the package and it matches
@@ -998,4 +1035,13 @@
 # if we mounted the U-Boot directory, unmount it.
 [[ -n ${mounted} ]] && umount ${ubootDir}
 
+# make sure changes make it to the disk.
+# if /boot is a mountpoint, force the meta data on disk
+# to by-pass writeback delay.
+# PPC64LE-only to deal with Petitboot issues
+if [[ ${ARCH} = ppc64le ]]
+then
+	sync && mountpoint -q /boot && fsfreeze -f /boot && fsfreeze -u /boot
+fi
+
 exit 0