svn commit: r229480 - in stable/9/sys: boot/common boot/forth conf kern

[Sergey Kandaurov]

Author: pluknet
Date: Wed Jan  4 13:49:46 2012
New Revision: 229480
URL: http://svn.freebsd.org/changeset/base/229480

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/9/sys/boot/common/loader.8
  stable/9/sys/boot/forth/loader.conf
  stable/9/sys/conf/NOTES
  stable/9/sys/kern/init_main.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/boot/common/loader.8
==============================================================================
--- stable/9/sys/boot/common/loader.8	Wed Jan  4 13:35:20 2012	(r229479)
+++ stable/9/sys/boot/common/loader.8	Wed Jan  4 13:49:46 2012	(r229480)
@@ -443,7 +443,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/9/sys/boot/forth/loader.conf
==============================================================================
--- stable/9/sys/boot/forth/loader.conf	Wed Jan  4 13:35:20 2012	(r229479)
+++ stable/9/sys/boot/forth/loader.conf	Wed Jan  4 13:49:46 2012	(r229480)
@@ -81,7 +81,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/9/sys/conf/NOTES
==============================================================================
--- stable/9/sys/conf/NOTES	Wed Jan  4 13:35:20 2012	(r229479)
+++ stable/9/sys/conf/NOTES	Wed Jan  4 13:49:46 2012	(r229480)
@@ -2812,7 +2812,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/9/sys/kern/init_main.c
==============================================================================
--- stable/9/sys/kern/init_main.c	Wed Jan  4 13:35:20 2012	(r229479)
+++ stable/9/sys/kern/init_main.c	Wed Jan  4 13:49:46 2012	(r229480)
@@ -641,7 +641,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");