summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2005-02-17 10:00:10 +0000
committerdes <des@FreeBSD.org>2005-02-17 10:00:10 +0000
commit627292879ce106dd9a8fa849c42f1c57df78dd52 (patch)
tree66c15e41a693eeb422ab4fe638e1103a05ee9339
parent627a049bbf941ad657c99714283f8f6529a0f5bf (diff)
downloadFreeBSD-src-627292879ce106dd9a8fa849c42f1c57df78dd52.zip
FreeBSD-src-627292879ce106dd9a8fa849c42f1c57df78dd52.tar.gz
Add /rescue/init to the default init_path, before /stand/sysinstall.
MFC after: 2 weeks
-rw-r--r--sys/boot/forth/loader.conf2
-rw-r--r--sys/kern/init_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index fa857dc..4496357 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -66,7 +66,7 @@ module_path="/boot/modules" # Set the module search path
#boot_serial="" # Use serial console
#boot_single="" # Start system in single-user mode
#boot_verbose="" # Causes extra debugging information to be printed
-#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall"
+#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall"
# Sets the list of init candidates
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index f26bd1c..8c9f7ff 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -493,7 +493,7 @@ static char init_path[MAXPATHLEN] =
#ifdef INIT_PATH
__XSTRING(INIT_PATH);
#else
- "/sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall";
+ "/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");
OpenPOWER on IntegriCloud