15 files changed, 2 insertions, 56 deletions

diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 85803e389e5a..62488029a5a5 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -352,10 +352,6 @@ is present.
 Prevents the kernel from initiating a multi-user startup; instead,
 a single-user mode will be entered when the kernel has finished
 device probing.
-.It Va boot_userconfig
-Requests that the kernel's interactive device configuration program
-be run when the kernel is booted.
-Currently a no-op.
 .It Va boot_verbose
 Setting this variable causes extra debugging information to be printed
 by the kernel during the boot phase.
diff --git a/sys/boot/efi/libefi/bootinfo.c b/sys/boot/efi/libefi/bootinfo.c
index 729ad701062c..44fde4661134 100644
--- a/sys/boot/efi/libefi/bootinfo.c
+++ b/sys/boot/efi/libefi/bootinfo.c
@@ -53,7 +53,6 @@ static struct
 } howto_names[] = {
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
-    {"boot_userconfig",	RB_CONFIG},
     {"boot_ddb",	RB_KDB},
     {"boot_gdb",	RB_GDB},
     {"boot_single",	RB_SINGLE},
@@ -86,9 +85,6 @@ bi_getboothowto(char *kargs)
 		case 'a':
 		    howto |= RB_ASKNAME;
 		    break;
-		case 'c':
-		    howto |= RB_CONFIG;
-		    break;
 		case 'C':
 		    howto |= RB_CDROM;
 		    break;
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 91489f978a79..fa857dc4a649 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -65,8 +65,6 @@ module_path="/boot/modules"	# Set the module search path
 #boot_multicons=""	# Use multiple consoles
 #boot_serial=""		# Use serial console
 #boot_single=""		# Start system in single-user mode
-#boot_userconfig=""	# Run kernel's interactive device configuration program;
-			# currently a no-op
 #boot_verbose=""	# Causes extra debugging information to be printed
 #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall"
 			# Sets the list of init candidates
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index 50952810b030..85638fee39d7 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -46,7 +46,6 @@ static struct
 } howto_names[] = {
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
-    {"boot_userconfig",	RB_CONFIG},
     {"boot_ddb",	RB_KDB},
     {"boot_gdb",	RB_GDB},
     {"boot_single",	RB_SINGLE},
@@ -77,9 +76,6 @@ bi_getboothowto(char *kargs)
 		case 'a':
 		    howto |= RB_ASKNAME;
 		    break;
-		case 'c':
-		    howto |= RB_CONFIG;
-		    break;
 		case 'C':
 		    howto |= RB_CDROM;
 		    break;
diff --git a/sys/boot/i386/loader/help.i386 b/sys/boot/i386/loader/help.i386
index c93db94ea161..e8a827705bd2 100644
--- a/sys/boot/i386/loader/help.i386
+++ b/sys/boot/i386/loader/help.i386
@@ -44,14 +44,6 @@
 	correctly locate the SCSI disk you are booting from.
 
 ################################################################################
-# Tset Sboot_userconfig DStart Userconfig
-
-	set boot_userconfig
-
-	Requests that the kernel's interactive device configuration program
-	be run when the kernel is booted.  Currently a no-op.
-
-################################################################################
 # Tset Sroot_disk_unit DForce the root disk unit number.
 
 	set root_disk_unit=<value>
diff --git a/sys/boot/ia64/common/bootinfo.c b/sys/boot/ia64/common/bootinfo.c
index 729ad701062c..44fde4661134 100644
--- a/sys/boot/ia64/common/bootinfo.c
+++ b/sys/boot/ia64/common/bootinfo.c
@@ -53,7 +53,6 @@ static struct
 } howto_names[] = {
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
-    {"boot_userconfig",	RB_CONFIG},
     {"boot_ddb",	RB_KDB},
     {"boot_gdb",	RB_GDB},
     {"boot_single",	RB_SINGLE},
@@ -86,9 +85,6 @@ bi_getboothowto(char *kargs)
 		case 'a':
 		    howto |= RB_ASKNAME;
 		    break;
-		case 'c':
-		    howto |= RB_CONFIG;
-		    break;
 		case 'C':
 		    howto |= RB_CDROM;
 		    break;
diff --git a/sys/boot/ia64/ski/bootinfo.c b/sys/boot/ia64/ski/bootinfo.c
index 9c67a9529de7..5bc1797520a1 100644
--- a/sys/boot/ia64/ski/bootinfo.c
+++ b/sys/boot/ia64/ski/bootinfo.c
@@ -48,7 +48,6 @@ static struct
 } howto_names[] = {
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
-    {"boot_userconfig",	RB_CONFIG},
     {"boot_ddb",	RB_KDB},
     {"boot_gdb",	RB_GDB},
     {"boot_single",	RB_SINGLE},
@@ -82,9 +81,6 @@ bi_getboothowto(char *kargs)
 		case 'a':
 		    howto |= RB_ASKNAME;
 		    break;
-		case 'c':
-		    howto |= RB_CONFIG;
-		    break;
 		case 'C':
 		    howto |= RB_CDROM;
 		    break;
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index d572ed272aa4..58c789d149f1 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -408,8 +408,6 @@ nextarg:
 					f |= RB_ASKNAME;
 				if (c == 'C')
 					f |= RB_CDROM;
-				if (c == 'c')
-					f |= RB_CONFIG;
 				if (c == 'D')
 					f ^= RB_DUAL;
 				if (c == 'd')
diff --git a/sys/boot/pc98/loader/help.pc98 b/sys/boot/pc98/loader/help.pc98
index f055e2d5bf9e..4b9197ce5074 100644
--- a/sys/boot/pc98/loader/help.pc98
+++ b/sys/boot/pc98/loader/help.pc98
@@ -26,14 +26,6 @@
 	correctly locate the SCSI disk you are booting from.
 
 ################################################################################
-# Tset Sboot_userconfig DStart Userconfig
-
-	set boot_userconfig
-
-	Requests that the kernel's interactive device configuration program
-	be run when the kernel is booted.  Currently a no-op.
-
-################################################################################
 # Tset Sroot_disk_unit DForce the root disk unit number.
 
 	set root_disk_unit=<value>
diff --git a/sys/boot/powerpc/loader/metadata.c b/sys/boot/powerpc/loader/metadata.c
index e11c81b7b6ce..fdeaa5960a1c 100644
--- a/sys/boot/powerpc/loader/metadata.c
+++ b/sys/boot/powerpc/loader/metadata.c
@@ -50,7 +50,6 @@ static struct
 } howto_names[] = {
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
-    {"boot_userconfig",	RB_CONFIG},
     {"boot_ddb",	RB_KDB},
     {"boot_gdb",	RB_GDB},
     {"boot_single",	RB_SINGLE},
@@ -81,9 +80,6 @@ md_getboothowto(char *kargs)
 		case 'a':
 		    howto |= RB_ASKNAME;
 		    break;
-		case 'c':
-		    howto |= RB_CONFIG;
-		    break;
 		case 'C':
 		    howto |= RB_CDROM;
 		    break;
diff --git a/sys/boot/powerpc/ofw/metadata.c b/sys/boot/powerpc/ofw/metadata.c
index e11c81b7b6ce..fdeaa5960a1c 100644
--- a/sys/boot/powerpc/ofw/metadata.c
+++ b/sys/boot/powerpc/ofw/metadata.c
@@ -50,7 +50,6 @@ static struct
 } howto_names[] = {
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
-    {"boot_userconfig",	RB_CONFIG},
     {"boot_ddb",	RB_KDB},
     {"boot_gdb",	RB_GDB},
     {"boot_single",	RB_SINGLE},
@@ -81,9 +80,6 @@ md_getboothowto(char *kargs)
 		case 'a':
 		    howto |= RB_ASKNAME;
 		    break;
-		case 'c':
-		    howto |= RB_CONFIG;
-		    break;
 		case 'C':
 		    howto |= RB_CDROM;
 		    break;
diff --git a/sys/boot/sparc64/loader/metadata.c b/sys/boot/sparc64/loader/metadata.c
index 6a9506ca2c48..0694b0857d69 100644
--- a/sys/boot/sparc64/loader/metadata.c
+++ b/sys/boot/sparc64/loader/metadata.c
@@ -56,7 +56,6 @@ static struct
 } howto_names[] = {
     {"boot_askname",	RB_ASKNAME},
     {"boot_cdrom",	RB_CDROM},
-    {"boot_userconfig",	RB_CONFIG},
     {"boot_ddb",	RB_KDB},
     {"boot_gdb",	RB_GDB},
     {"boot_single",	RB_SINGLE},
@@ -89,9 +88,6 @@ md_getboothowto(char *kargs)
 		case 'a':
 		    howto |= RB_ASKNAME;
 		    break;
-		case 'c':
-		    howto |= RB_CONFIG;
-		    break;
 		case 'C':
 		    howto |= RB_CDROM;
 		    break;
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index f92d2fb16308..3c7eb23690e3 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -1865,7 +1865,7 @@ scsplash_callback(int event, void *arg)
 	if (add_scrn_saver(scsplash_saver) == 0) {
 	    sc->flags &= ~SC_SAVER_FAILED;
 	    run_scrn_saver = TRUE;
-	    if (cold && !(boothowto & (RB_VERBOSE | RB_CONFIG))) {
+	    if (cold && !(boothowto & RB_VERBOSE)) {
 		scsplash_stick(TRUE);
 		(*current_saver)(sc, TRUE);
 	    }
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 0908eec8eab5..4842809f784a 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -143,8 +143,7 @@ cninit(void)
         cn_mute = ((boothowto & (RB_MUTE
 			|RB_SINGLE
 			|RB_VERBOSE
-			|RB_ASKNAME
-			|RB_CONFIG)) == RB_MUTE);
+			|RB_ASKNAME)) == RB_MUTE);
 
 	/*
 	 * Find the first console with the highest priority.
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index c296c89e9810..e861a38f7e55 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -49,7 +49,6 @@
 #define	RB_RDONLY	0x080	/* mount root fs read-only */
 #define	RB_DUMP		0x100	/* dump kernel memory before reboot */
 #define	RB_MINIROOT	0x200	/* mini-root present in memory at boot time */
-#define	RB_CONFIG	0x400	/* invoke user configuration routing */
 #define	RB_VERBOSE	0x800	/* print all potentially useful info */
 #define	RB_SERIAL	0x1000	/* use serial port as console */
 #define	RB_CDROM	0x2000	/* use cdrom as root */