summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-09-10 13:43:57 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-09-10 13:43:57 +0000
commit2e56f6dd37022646f1c44c8cc9365f0da249a39a (patch)
tree203d84158dad41803fe3852d29d8577bc4f308b6
parentdfa16e4a89158f3d3198db71e2eba3bda9330078 (diff)
downloads6-linux-init-2e56f6dd37022646f1c44c8cc9365f0da249a39a.tar.xz
Change initial_path to include /usr/sbin and /sbin, because stage 3
-rw-r--r--doc/s6-linux-init-maker.html2
-rw-r--r--src/init/s6-linux-init-maker.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/s6-linux-init-maker.html b/doc/s6-linux-init-maker.html
index 4eee9db..cc18bf4 100644
--- a/doc/s6-linux-init-maker.html
+++ b/doc/s6-linux-init-maker.html
@@ -326,7 +326,7 @@ absolutely necessary for
<a href="http://skarnet.org/software/s6-linux-utils/">s6-linux-utils</a>
binaries to be accessible via <em>initial_path</em>, else the machine
will not boot. Default is
-<strong><tt>/usr/bin:/bin</tt></strong>. </li> <p />
+<strong><tt>/usr/bin:/usr/sbin:/bin:/sbin</tt></strong>. </li> <p />
<li> <tt>-m</tt>&nbsp;<em>initial_umask</em>&nbsp;: the value of
the initial file umask for all the starting processes, in octal.
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index 60c5353..58a9ccd 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -37,7 +37,7 @@ static char const *init_script = "/etc/rc.init" ;
static char const *tini_script = "/etc/rc.tini" ;
static char const *shutdown_script = "/etc/rc.shutdown" ;
static char const *bindir = "/bin" ;
-static char const *initial_path = "/usr/bin:/bin" ;
+static char const *initial_path = "/usr/bin:/usr/sbin:/bin:/sbin" ;
static char const *env_store = 0 ;
static char const *early_getty = 0 ;
static uid_t uncaught_logs_uid = 0 ;