Author: pluknet
Date: Wed Jan 4 13:53:50 2012
New Revision: 229481
URL: http://svn.freebsd.org/changeset/base/229481
Log:
Revert MFC r226833,227056.
/stand exists in the MFS root used during a sysinstall-based install.
Reported by: jhb
Pointy hat to: pluknet
Modified:
stable/8/sys/boot/common/loader.8
stable/8/sys/boot/forth/loader.conf
stable/8/sys/conf/NOTES
stable/8/sys/kern/init_main.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.32 (props changed)
stable/8/sys/conf/ldscript.mips.octeon1.64 (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/boot/common/loader.8
==============================================================================
--- stable/8/sys/boot/common/loader.8 Wed Jan 4 13:49:46 2012
(r229480)
+++ stable/8/sys/boot/common/loader.8 Wed Jan 4 13:53:50 2012
(r229481)
@@ -449,7 +449,7 @@ Sets the list of binaries which the kern
process.
The first matching binary is used.
The default list is
-.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init .
+.Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:\:/rescue/init:/stand/sysinstall .
.It Va init_script
If set to a valid file name in the root file system,
instructs
Modified: stable/8/sys/boot/forth/loader.conf
==============================================================================
--- stable/8/sys/boot/forth/loader.conf Wed Jan 4 13:49:46 2012
(r229480)
+++ stable/8/sys/boot/forth/loader.conf Wed Jan 4 13:53:50 2012
(r229481)
@@ -76,7 +76,7 @@ module_path="/boot/modules" # Set the mo
#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"
+#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall"
# 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.
Modified: stable/8/sys/conf/NOTES
==============================================================================
--- stable/8/sys/conf/NOTES Wed Jan 4 13:49:46 2012 (r229480)
+++ stable/8/sys/conf/NOTES Wed Jan 4 13:53:50 2012 (r229481)
@@ -2733,7 +2733,7 @@ options UBSEC_RNDTEST # enable rndtest
# Embedded system options:
#
# An embedded system might want to run something other than init.
-options INIT_PATH=/sbin/init:/rescue/init
+options INIT_PATH=/sbin/init:/stand/sysinstall
# Debug options
options BUS_DEBUG # enable newbus debugging
Modified: stable/8/sys/kern/init_main.c
==============================================================================
--- stable/8/sys/kern/init_main.c Wed Jan 4 13:49:46 2012
(r229480)
+++ stable/8/sys/kern/init_main.c Wed Jan 4 13:53:50 2012
(r229481)
@@ -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";
+ "/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall";
#endif
SYSCTL_STRING(_kern, OID_AUTO, init_path, CTLFLAG_RD, init_path, 0,
"Path used to search the init process");
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
