d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the last vestiges of the userconfig option. None of this actually

Browse Source 
did anything, so this commit should be considered a NO-OP.
This commit is contained in:
scottl 2004-12-01 04:59:33 +00:00
parent bbfe6568e2
commit 3b185ba05b
15 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/common/loader.8
View File

@ -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.

4
sys/boot/efi/libefi/bootinfo.c
View File

@ -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;

2
sys/boot/forth/loader.conf
View File

@ -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

4
sys/boot/i386/libi386/bootinfo.c
View File

@ -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;

8
sys/boot/i386/loader/help.i386
View File

@ -43,14 +43,6 @@
to tell the kernel how many IDE disks there are in order to have it
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.

4
sys/boot/ia64/common/bootinfo.c
View File

@ -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;

4
sys/boot/ia64/ski/bootinfo.c
View File

@ -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;

2
sys/boot/pc98/boot2/boot.c
View File

@ -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')

8
sys/boot/pc98/loader/help.pc98
View File

@ -25,14 +25,6 @@
to tell the kernel how many IDE disks there are in order to have it
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.

4
sys/boot/powerpc/loader/metadata.c
View File

@ -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;

4
sys/boot/powerpc/ofw/metadata.c
View File

@ -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;

4
sys/boot/sparc64/loader/metadata.c
View File

@ -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;

2
sys/dev/syscons/syscons.c
View File

@ -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);
}

3
sys/kern/tty_cons.c
View File

@ -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.

1
sys/sys/reboot.h
View File

@ -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 */