X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=utils%2Fpb-console;h=5ba98cc4692564b435d1f7d271bf07355e838c06;hp=c6def47a74d010a1bfd7bd7111ca57717c5df0e5;hb=5c726bd40a4a745e115a22e336131be8f6666b55;hpb=d4b138a5ea9acda3a4839f89d0fa892f20a4c17a

diff --git a/utils/pb-console b/utils/pb-console
index c6def47..5ba98cc 100644
--- a/utils/pb-console
+++ b/utils/pb-console
@@ -80,12 +80,24 @@ then
 	then
 		getty="$getty_arg"
 	fi
+
+	login_arg="-l$0"
+	for ttyarg in "$@"
+	do
+		# If the getty args include autologin don't override with -l
+		# and leave calling petitboot-nc to the user's init
+		if [ "$ttyarg" == "-a" ]
+		then
+			login_arg=""
+		fi
+	done
+
 	if [ "$detach" = 1 ]
 	then
-		$getty -l $0 "$@" &
+		setsid -c $getty $login_arg "$@" &
 		exit
 	else
-		exec $getty -l $0 "$@"
+		exec $getty $login_arg "$@"
 	fi
 fi
 
@@ -118,10 +130,16 @@ then
 	verbose_opt=--verbose
 fi
 
+# kernel messages may write over the ncurses ui - change log level to only
+# show particularly important messages
+dmesg -n 1
+
+trap '' SIGINT
+trap 'reset; echo "SIGTERM received, booting..."; sleep 2' SIGTERM
+
 while :
 do
 	$ui $verbose_opt
 	reset
-	echo "Exiting petitboot. Type 'exit' to return."
 	$shell
 done