X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=utils%2Fpb-console;h=9da899fdf7b242f4c47652cd0d753c0691445253;hp=00b25acf44c8d996bafaf178673805766a0f88b0;hb=37bff93c8b0a71432613f41f2319dc073ca64619;hpb=6e2d2e78a178a40bcbce903020626c62f74bf046

diff --git a/utils/pb-console b/utils/pb-console
index 00b25ac..9da899f 100644
--- a/utils/pb-console
+++ b/utils/pb-console
@@ -6,63 +6,107 @@
 
 ui=petitboot-nc
 shell=sh
-
+getty=/sbin/getty
+use_getty=0
 detach=0
 
 usage() {
 	cat >&2 <<EOF
-pb-console [OPTIONS] console_dev
+pb-console [OPTIONS] -- [ARGS]
 OPTIONS
      -d, --detach
              Start in a detached (background) state.
+
+     -g, --getty[=PATH]
+             Start a getty (specified by PATH, otherwise $getty),
+             passing additional ARGS to the getty process
+
+     -s, --shell=PATH
+             Use PATH as the exit-to-shell shell
+
+     -u, --ui=PATH
+             Use PATH as the petitboot UI
+
      -h, --help
              Print a help message.
 EOF
 	exit 1
 }
 
-while [ -n "$1" ]
+opts=$(getopt --options 'hdg::s:u:' \
+              --long 'help,detach,getty::,shell:,ui:' \
+              -- "$@")
+[ $? = 0 ] || exit 1
+
+eval set -- "$opts"
+
+while :
 do
 	case "$1" in
-	--detach | -d)
+	-d | --detach)
 		detach=1
+		shift
+		;;
+	-g | --getty)
+		use_getty=1
+		getty_arg="$2"
+		shift 2
+		;;
+	-s | --shell)
+		shell="$2"
+		shift 2
+		;;
+	-u | --ui)
+		ui="$2"
+		shift 2
 		;;
 	--help | -h)
 		usage
 		;;
 	--)
+		shift
+		break
 		;;
 	*)
-		console=$1
-		;;
+		echo "getopt error"
+		exit 1
 	esac
-	shift
 done
 
-if [ -n "$console" -a "${console#/dev/}" = "$console" ]
+if [ "$use_getty" = 1 ]
 then
-	console="/dev/$console"
+	if [ -n "$getty_arg" ]
+	then
+		getty="$getty_arg"
+	fi
+	if [ "$detach" = 1 ]
+	then
+		$getty -l $0 "$@" &
+		exit
+	else
+		exec $getty -l $0 "$@"
+	fi
 fi
 
-pb_loop() {
-	while :
-	do
-		$ui
-		echo "Exiting petitboot. Type 'exit' to return."
-		$shell
-	done
-}
+for f in /etc/environment /etc/locale
+do
+	if [ -e "$f" ]
+	then
+		export $(cat "$f")
+	fi
+done
 
-if [ -n "$console" ]
+verbose_opt=
+sysinfo_bin=$(dirname $0)/pb-sysinfo
+if [ -x $sysinfo_bin ] && $sysinfo_bin --debug-enabled
 then
-	exec <$console >$console 2>&1
+	verbose_opt=--verbose
 fi
 
-if [ "$detach" = 1 ]
-then
-	(
-		pb_loop
-	) &
-else
-	pb_loop
-fi
+while :
+do
+	$ui $verbose_opt
+	reset
+	echo "Exiting petitboot. Type 'exit' to return."
+	$shell
+done