Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Oct 2011 10:25:11 +0000 (UTC)
From:      Sergey Kandaurov <pluknet@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226833 - in head/sys: boot/forth kern
Message-ID:  <201110271025.p9RAPBZU001492@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pluknet
Date: Thu Oct 27 10:25:11 2011
New Revision: 226833
URL: http://svn.freebsd.org/changeset/base/226833

Log:
  Remove the long reprecated ``/stand/sysinstall'' from the init_path.
  
  It can be put back using the INIT_PATH config option or init_path
  loader variable, if still needed (which I doubt).
  
  MFC after:	1 week

Modified:
  head/sys/boot/forth/loader.conf
  head/sys/kern/init_main.c

Modified: head/sys/boot/forth/loader.conf
==============================================================================
--- head/sys/boot/forth/loader.conf	Thu Oct 27 10:21:40 2011	(r226832)
+++ head/sys/boot/forth/loader.conf	Thu Oct 27 10:25:11 2011	(r226833)
@@ -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:/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.

Modified: head/sys/kern/init_main.c
==============================================================================
--- head/sys/kern/init_main.c	Thu Oct 27 10:21:40 2011	(r226832)
+++ head/sys/kern/init_main.c	Thu Oct 27 10:25:11 2011	(r226833)
@@ -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:/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");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110271025.p9RAPBZU001492>