X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=utils%2Fpb-console;h=9da899fdf7b242f4c47652cd0d753c0691445253;hp=81be2183ca8c2e1f4bef273c0ecbfbda4fc16d62;hb=a83a614d94b09d063d56bf28be6f9dd0d0e22854;hpb=d28c07b5e23237a97387435e157e248e19128598;ds=sidebyside

diff --git a/utils/pb-console b/utils/pb-console
index 81be218..9da899f 100644
--- a/utils/pb-console
+++ b/utils/pb-console
@@ -82,14 +82,31 @@ then
 	if [ "$detach" = 1 ]
 	then
 		$getty -l $0 "$@" &
+		exit
 	else
 		exec $getty -l $0 "$@"
 	fi
 fi
 
+for f in /etc/environment /etc/locale
+do
+	if [ -e "$f" ]
+	then
+		export $(cat "$f")
+	fi
+done
+
+verbose_opt=
+sysinfo_bin=$(dirname $0)/pb-sysinfo
+if [ -x $sysinfo_bin ] && $sysinfo_bin --debug-enabled
+then
+	verbose_opt=--verbose
+fi
+
 while :
 do
-	$ui
+	$ui $verbose_opt
+	reset
 	echo "Exiting petitboot. Type 'exit' to return."
 	$shell
 done