From 1aebd090c6a73d0fea2b8c8efed298343c2bf609 Mon Sep 17 00:00:00 2001 From: pluknet Date: Wed, 4 Jan 2012 12:48:24 +0000 Subject: [PATCH] MFC r226833,r227056: Remove the long reprecated ``/stand/sysinstall'' from the init_path. git-svn-id: svn://svn.freebsd.org/base/stable/8@229474 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/boot/common/loader.8 | 2 +- sys/boot/forth/loader.conf | 2 +- sys/conf/NOTES | 2 +- sys/kern/init_main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 694fac8c0..c75143b5e 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -449,7 +449,7 @@ Sets the list of binaries which the kernel will try to run as the initial process. The first matching binary is used. The default list is -.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall . +.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init . .It Va init_script If set to a valid file name in the root file system, instructs diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 00654c879..2c4451bcf 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -76,7 +76,7 @@ module_path="/boot/modules" # Set the module search path #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 -#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall" +#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init" # Sets the list of init candidates #init_shell="/bin/sh" # The shell binary used by init(8). #init_script="" # Initial script to run by init(8) before chrooting. diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 6e2238f8e..6721bdc6e 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2733,7 +2733,7 @@ options UBSEC_RNDTEST # enable rndtest support # Embedded system options: # # An embedded system might want to run something other than init. -options INIT_PATH=/sbin/init:/stand/sysinstall +options INIT_PATH=/sbin/init:/rescue/init # Debug options options BUS_DEBUG # enable newbus debugging diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a9626b06f..90ab21fd5 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -623,7 +623,7 @@ static char init_path[MAXPATHLEN] = #ifdef INIT_PATH __XSTRING(INIT_PATH); #else - "/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall"; + "/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"; #endif SYSCTL_STRING(_kern, OID_AUTO, init_path, CTLFLAG_RD, init_path, 0, "Path used to search the init process"); -- 2.45.0