--- trunk/grubby/new-kernel-pkg	2016/06/30 10:22:14	2973
+++ trunk/grubby/new-kernel-pkg	2016/06/30 10:39:38	2996
@@ -155,7 +155,7 @@
 mbargs="${HYPERVISOR_ARGS}"
 adddracutargs=""
 addplymouthinitrd=""
-DEBUGARG="systemd.debug"
+DEBUGARG="systemd.log_level=debug systemd.log_target=kmsg"
 
 usage()
 {
@@ -177,7 +177,12 @@
 	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
@@ -1056,4 +1061,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