From b7f31dafc46e772d98405e93bc21c271d8087b7e Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 17 Jun 2015 11:05:01 +0000 Subject: Change default robase to /etc/s6-linux-init --- doc/s6-linux-init-maker.html | 2 +- src/init/s6-linux-init-maker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/s6-linux-init-maker.html b/doc/s6-linux-init-maker.html index 3c27a2f..cdf617e 100644 --- a/doc/s6-linux-init-maker.html +++ b/doc/s6-linux-init-maker.html @@ -194,7 +194,7 @@ will read its read-only data from basedir. After running s6-linux-init-maker, the administrator should make sure to copy the created directory dir to basedir. basedir must be absolute. Default is -/etc/s6.

+/etc/s6-linux-init.

  • -l tmpfsdir : at boot time, a tmpfs will be mounted on tmpfsdir. The directory should already exist in diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c index a965cc0..b897115 100644 --- a/src/init/s6-linux-init-maker.c +++ b/src/init/s6-linux-init-maker.c @@ -40,7 +40,7 @@ S6_PORTABLE_UTILS_EXTBINPREFIX "s6-echo -- " \ #define BANNER2 "s6-init: stage 2" static char const *slashrun = "/run" ; -static char const *robase = "/etc/s6" ; +static char const *robase = "/etc/s6-linux-init" ; static char const *init_script = "/etc/rc.init" ; static char const *shutdown_script = "/etc/rc.shutdown" ; static char const *bindir = "/bin" ; -- cgit v1.2.3