diff options
author | ru <ru@FreeBSD.org> | 2004-09-30 18:23:35 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2004-09-30 18:23:35 +0000 |
commit | 73b20fb9b8757f6f70c9e0a439caacab80b43058 (patch) | |
tree | bbf6e6c419edaef953792030a9d15f801dc2e24f /sys | |
parent | 59af2fcb6160a6641a9c623c2d4a7ca364747a12 (diff) | |
download | FreeBSD-src-73b20fb9b8757f6f70c9e0a439caacab80b43058.zip FreeBSD-src-73b20fb9b8757f6f70c9e0a439caacab80b43058.tar.gz |
Retire now useless userconfig_script_*.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/boot/common/loader.8 | 8 | ||||
-rw-r--r-- | sys/boot/forth/loader.conf | 4 | ||||
-rw-r--r-- | sys/boot/forth/loader.conf.5 | 7 |
3 files changed, 2 insertions, 17 deletions
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 5e53449..44090d6 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -779,18 +779,12 @@ Boot in single user mode: .Pp .Dl boot -s .Pp -Load kernel's user configuration file. +Load the kernel, a splash screen, and then autoboot in five seconds. Notice that a kernel must be loaded before any other .Ic load command is attempted. .Bd -literal -offset indent load kernel -load -t userconfig_script /boot/kernel.conf -.Ed -.Pp -Load the kernel, a splash screen, and then autoboot in five seconds. -.Bd -literal -offset indent -load kernel load splash_bmp load -t splash_image_data /boot/chuckrulez.bmp autoboot 5 diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 6158948..c0f6fad 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -18,10 +18,6 @@ kernel="kernel" # /boot sub-directory containing kernel and modules bootfile="kernel" # Kernel name (possibly absolute path) kernel_options="" -userconfig_script_load="NO" -userconfig_script_name="/boot/kernel.conf" -userconfig_script_type="userconfig_script" - loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" nextboot_conf="/boot/nextboot.conf" nextboot_enable="NO" diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5 index 350a082..387d575 100644 --- a/sys/boot/forth/loader.conf.5 +++ b/sys/boot/forth/loader.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd April 18, 1999 +.Dd September 30, 2004 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -189,11 +189,6 @@ If set to .Dq YES , will load the splash screen module, making it possible to display a pcx image on the screen while booting. -.It Va userconfig_script_load -.Pq Dq NO -If set to -.Dq YES , -will load the userconfig data. .It Va vesa_load .Pq Dq NO If set to |