From owner-svn-src-all@FreeBSD.ORG  Thu Oct 27 10:25:11 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8AA891065679;
	Thu, 27 Oct 2011 10:25:11 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 79F598FC16;
	Thu, 27 Oct 2011 10:25:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9RAPBdo001495;
	Thu, 27 Oct 2011 10:25:11 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9RAPBZU001492;
	Thu, 27 Oct 2011 10:25:11 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201110271025.p9RAPBZU001492@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Thu, 27 Oct 2011 10:25:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226833 - in head/sys: boot/forth kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 10:25:11 -0000

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");