Add loader(8) variables for RB_DFLTROOT, RB_MUTE, and RB_PAUSE:

"boot_dfltroot", "boot_mute", and "boot_pause" respectively.

10 files changed, 90 insertions, 15 deletions

diff --git a/sys/boot/common/help.common b/sys/boot/common/help.common
index a2c2ff7..ce78718 100644
--- a/sys/boot/common/help.common
+++ b/sys/boot/common/help.common
@@ -170,6 +170,14 @@
 	proceeding to initialize when booted.
 
 ################################################################################
+# Tset Sboot_dfltroot DUse default root file system
+
+	set boot_dfltroot
+
+	Instructs the kernel to mount the statically compiled-in root
+	file system.
+
+################################################################################
 # Tset Sboot_gdb DSelect gdb-remote mode for the kernel debugger
 
 	set boot_gdb
@@ -186,6 +194,22 @@
 	by the conscontrol(8) utility.
 
 ################################################################################
+# Tset Sboot_mute DMute the console
+
+	set boot_mute
+
+	All console output is suppressed when console is muted.
+	In a running system, the state of console muting can be
+	manipulated by the conscontrol(8) utility.
+
+################################################################################
+# Tset Sboot_pause DPause after each line during device probing
+
+	set boot_pause
+
+	During the device probe, pause after each line is printed.
+
+################################################################################
 # Tset Sboot_serial DUse serial console
 
 	set boot_serial
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 3e99eea..41d14f4 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 18, 2005
+.Dd September 22, 2005
 .Dt LOADER 8
 .Os
 .Sh NAME
@@ -370,6 +370,8 @@ Instructs the kernel to try to mount the root file system from CD-ROM.
 .It Va boot_ddb
 Instructs the kernel to start in the DDB debugger, rather than
 proceeding to initialize when booted.
+.It Va boot_dfltroot
+Instructs the kernel to mount the statically compiled-in root file system.
 .It Va boot_gdb
 Selects gdb-remote mode for the kernel debugger by default.
 .It Va boot_multicons
@@ -378,6 +380,13 @@ In a running system, console configuration can be manipulated
 by the
 .Xr conscontrol 8
 utility.
+.It Va boot_mute
+All console output is suppressed when console is muted.
+In a running system, the state of console muting can be manipulated by the
+.Xr conscontrol 8
+utility.
+.It Va boot_pause
+During the device probe, pause after each line is printed.
 .It Va boot_serial
 Force the use of a serial console even when an internal console
 is present.
diff --git a/sys/boot/efi/libefi/bootinfo.c b/sys/boot/efi/libefi/bootinfo.c
index 44fde46..9645968 100644
--- a/sys/boot/efi/libefi/bootinfo.c
+++ b/sys/boot/efi/libefi/bootinfo.c
@@ -54,11 +54,14 @@ static struct
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
     {"boot_ddb",	RB_KDB},
+    {"boot_dfltroot",	RB_DFLTROOT},
     {"boot_gdb",	RB_GDB},
-    {"boot_single",	RB_SINGLE},
-    {"boot_verbose",	RB_VERBOSE},
     {"boot_multicons",	RB_MULTIPLE},
+    {"boot_mute",	RB_MUTE},
+    {"boot_pause",	RB_PAUSE},
     {"boot_serial",	RB_SERIAL},
+    {"boot_single",	RB_SINGLE},
+    {"boot_verbose",	RB_VERBOSE},
     {NULL,	0}
 };
 
@@ -103,6 +106,9 @@ bi_getboothowto(char *kargs)
 		case 'h':
 		    howto |= RB_SERIAL;
 		    break;
+		case 'p':
+		    howto |= RB_PAUSE;
+		    break;
 		case 'r':
 		    howto |= RB_DFLTROOT;
 		    break;
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 98272b5..3789a58 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -67,8 +67,11 @@ module_path="/boot/modules"	# Set the module search path
 #boot_askname=""	# -a: Prompt the user for the name of the root device
 #boot_cdrom=""		# -C: Attempt to mount root file system from CD-ROM
 #boot_ddb=""		# -d: Instructs the kernel to start in the DDB debugger
+#boot_dfltroot=""	# -r: Use the statically configured root file system
 #boot_gdb=""		# -g: Selects gdb-remote mode for the kernel debugger
 #boot_multicons=""	# -D: Use multiple consoles
+#boot_mute=""		# -m: Mute the console
+#boot_pause=""		# -p: Pause after each line during device probing
 #boot_serial=""		# -h: Use serial console
 #boot_single=""		# -s: Start system in single-user mode
 #boot_verbose=""	# -v: Causes extra debugging information to be printed
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 623351c..41d0702 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -47,11 +47,14 @@ static struct
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
     {"boot_ddb",	RB_KDB},
+    {"boot_dfltroot",	RB_DFLTROOT},
     {"boot_gdb",	RB_GDB},
-    {"boot_single",	RB_SINGLE},
-    {"boot_verbose",	RB_VERBOSE},
     {"boot_multicons",	RB_MULTIPLE},
+    {"boot_mute",	RB_MUTE},
+    {"boot_pause",	RB_PAUSE},
     {"boot_serial",	RB_SERIAL},
+    {"boot_single",	RB_SINGLE},
+    {"boot_verbose",	RB_VERBOSE},
     {NULL,	0}
 };
 
diff --git a/sys/boot/ia64/common/bootinfo.c b/sys/boot/ia64/common/bootinfo.c
index 44fde46..9645968 100644
--- a/sys/boot/ia64/common/bootinfo.c
+++ b/sys/boot/ia64/common/bootinfo.c
@@ -54,11 +54,14 @@ static struct
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
     {"boot_ddb",	RB_KDB},
+    {"boot_dfltroot",	RB_DFLTROOT},
     {"boot_gdb",	RB_GDB},
-    {"boot_single",	RB_SINGLE},
-    {"boot_verbose",	RB_VERBOSE},
     {"boot_multicons",	RB_MULTIPLE},
+    {"boot_mute",	RB_MUTE},
+    {"boot_pause",	RB_PAUSE},
     {"boot_serial",	RB_SERIAL},
+    {"boot_single",	RB_SINGLE},
+    {"boot_verbose",	RB_VERBOSE},
     {NULL,	0}
 };
 
@@ -103,6 +106,9 @@ bi_getboothowto(char *kargs)
 		case 'h':
 		    howto |= RB_SERIAL;
 		    break;
+		case 'p':
+		    howto |= RB_PAUSE;
+		    break;
 		case 'r':
 		    howto |= RB_DFLTROOT;
 		    break;
diff --git a/sys/boot/ia64/ski/bootinfo.c b/sys/boot/ia64/ski/bootinfo.c
index 5bc1797..a003d98 100644
--- a/sys/boot/ia64/ski/bootinfo.c
+++ b/sys/boot/ia64/ski/bootinfo.c
@@ -49,11 +49,14 @@ static struct
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
     {"boot_ddb",	RB_KDB},
+    {"boot_dfltroot",	RB_DFLTROOT},
     {"boot_gdb",	RB_GDB},
-    {"boot_single",	RB_SINGLE},
-    {"boot_verbose",	RB_VERBOSE},
     {"boot_multicons",	RB_MULTIPLE},
+    {"boot_mute",	RB_MUTE},
+    {"boot_pause",	RB_PAUSE},
     {"boot_serial",	RB_SERIAL},
+    {"boot_single",	RB_SINGLE},
+    {"boot_verbose",	RB_VERBOSE},
     {NULL,	0}
 };
 
@@ -99,6 +102,9 @@ bi_getboothowto(char *kargs)
 		case 'h':
 		    howto |= RB_SERIAL;
 		    break;
+		case 'p':
+		    howto |= RB_PAUSE;
+		    break;
 		case 'r':
 		    howto |= RB_DFLTROOT;
 		    break;
diff --git a/sys/boot/powerpc/loader/metadata.c b/sys/boot/powerpc/loader/metadata.c
index fdeaa59..37c2bb7 100644
--- a/sys/boot/powerpc/loader/metadata.c
+++ b/sys/boot/powerpc/loader/metadata.c
@@ -51,11 +51,14 @@ static struct
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
     {"boot_ddb",	RB_KDB},
+    {"boot_dfltroot",	RB_DFLTROOT},
     {"boot_gdb",	RB_GDB},
-    {"boot_single",	RB_SINGLE},
-    {"boot_verbose",	RB_VERBOSE},
     {"boot_multicons",	RB_MULTIPLE},
+    {"boot_mute",	RB_MUTE},
+    {"boot_pause",	RB_PAUSE},
     {"boot_serial",	RB_SERIAL},
+    {"boot_single",	RB_SINGLE},
+    {"boot_verbose",	RB_VERBOSE},
     {NULL,	0}
 };
 
@@ -98,6 +101,9 @@ md_getboothowto(char *kargs)
 		case 'h':
 		    howto |= RB_SERIAL;
 		    break;
+		case 'p':
+		    howto |= RB_PAUSE;
+		    break;
 		case 'r':
 		    howto |= RB_DFLTROOT;
 		    break;
diff --git a/sys/boot/powerpc/ofw/metadata.c b/sys/boot/powerpc/ofw/metadata.c
index fdeaa59..37c2bb7 100644
--- a/sys/boot/powerpc/ofw/metadata.c
+++ b/sys/boot/powerpc/ofw/metadata.c
@@ -51,11 +51,14 @@ static struct
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
     {"boot_ddb",	RB_KDB},
+    {"boot_dfltroot",	RB_DFLTROOT},
     {"boot_gdb",	RB_GDB},
-    {"boot_single",	RB_SINGLE},
-    {"boot_verbose",	RB_VERBOSE},
     {"boot_multicons",	RB_MULTIPLE},
+    {"boot_mute",	RB_MUTE},
+    {"boot_pause",	RB_PAUSE},
     {"boot_serial",	RB_SERIAL},
+    {"boot_single",	RB_SINGLE},
+    {"boot_verbose",	RB_VERBOSE},
     {NULL,	0}
 };
 
@@ -98,6 +101,9 @@ md_getboothowto(char *kargs)
 		case 'h':
 		    howto |= RB_SERIAL;
 		    break;
+		case 'p':
+		    howto |= RB_PAUSE;
+		    break;
 		case 'r':
 		    howto |= RB_DFLTROOT;
 		    break;
diff --git a/sys/boot/sparc64/loader/metadata.c b/sys/boot/sparc64/loader/metadata.c
index 3fe7677..3f6af23 100644
--- a/sys/boot/sparc64/loader/metadata.c
+++ b/sys/boot/sparc64/loader/metadata.c
@@ -59,11 +59,14 @@ static struct
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
     {"boot_ddb",	RB_KDB},
+    {"boot_dfltroot",	RB_DFLTROOT},
     {"boot_gdb",	RB_GDB},
-    {"boot_single",	RB_SINGLE},
-    {"boot_verbose",	RB_VERBOSE},
     {"boot_multicons",	RB_MULTIPLE},
+    {"boot_mute",	RB_MUTE},
+    {"boot_pause",	RB_PAUSE},
     {"boot_serial",	RB_SERIAL},
+    {"boot_single",	RB_SINGLE},
+    {"boot_verbose",	RB_VERBOSE},
     {NULL,	0}
 };
 
@@ -106,6 +109,9 @@ md_getboothowto(char *kargs)
 		case 'h':
 		    howto |= RB_SERIAL;
 		    break;
+		case 'p':
+		    howto |= RB_PAUSE;
+		    break;
 		case 'r':
 		    howto |= RB_DFLTROOT;
 		    break;