diff --git a/recipes-phosphor/initrdscripts/files/obmc-init.sh b/recipes-phosphor/initrdscripts/files/obmc-init.sh
index 62be89f..e61ede9 100644
--- a/recipes-phosphor/initrdscripts/files/obmc-init.sh
+++ b/recipes-phosphor/initrdscripts/files/obmc-init.sh
@@ -128,18 +128,25 @@
 
 debug_takeover() {
 	echo "$@"
-	test -n "$@" && echo Enter password to try to manually fix.
+
+	if ! grep -w enable-initrd-debug-sh "$optfile"
+	then
+		echo "Fatal error, triggering kernel panic!"
+		exit 1
+	fi
+
+	test -n "$@" && echo Try to manually fix.
 	cat << HERE
 After fixing run exit to continue this script, or reboot -f to retry, or
 touch /takeover and exit to become PID 1 allowing editing of this script.
 HERE
 
-	while ! sulogin && ! test -f /takeover
+	while ! /bin/sh && ! test -f /takeover
 	do
-		echo getty failed, retrying
+		echo /bin/sh failed, retrying
 	done
 
-	# Touch /takeover in the above getty to become pid 1
+	# Touch /takeover in the above shell to become pid 1
 	if test -e /takeover
 	then
 		cat << HERE
@@ -208,7 +215,12 @@
 
 if grep -w debug-init-sh $optfile
 then
-	debug_takeover "Debug initial shell requested by command line."
+	if grep -w enable-initrd-debug-sh "$optfile"
+	then
+		debug_takeover "Debug initial shell requested by command line."
+	else
+		echo "Need to also add enable-initrd-debug-sh for debug shell."
+	fi
 fi
 
 if test "x$consider_download_files" = xy &&
@@ -394,7 +406,7 @@
 
 Mounting read-write $rwdev filesystem failed.  Please fix and run
 	mount $rwdev $rwdir -t $rwfst -o $rwopts
-to to continue, or do change nothing to run from RAM for this boot.
+or perform a factory reset with the clean-rwfs-filesystem option.
 HERE
 	debug_takeover "$msg"
 fi
@@ -411,7 +423,7 @@
 Unable to confirm /sbin/init is an executable non-empty file
 in merged file system mounted at /root.
 
-Change Root test failed!  Invoking emergency shell.
+Change Root test failed!
 HERE
 	debug_takeover "$msg"
 done