summaryrefslogtreecommitdiff
path: root/src/init
diff options
context:
space:
mode:
Diffstat (limited to 'src/init')
-rw-r--r--src/init/s6-linux-init-maker.c123
-rw-r--r--src/init/s6-linux-init-telinit.c6
-rw-r--r--src/init/s6-linux-init.c150
3 files changed, 207 insertions, 72 deletions
diff --git a/src/init/s6-linux-init-maker.c b/src/init/s6-linux-init-maker.c
index ccf1f08..9277acd 100644
--- a/src/init/s6-linux-init-maker.c
+++ b/src/init/s6-linux-init-maker.c
@@ -28,12 +28,12 @@
#ifdef S6_LINUX_INIT_UTMPD_PATH
# include <utmps/config.h>
-# define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] [ -n | -N ] [ -f skeldir ] [ -U utmp_user ] dir"
-# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:D:nNf:U:"
+# define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] [ -n | -N ] [ -f skeldir ] [ -U utmp_user ] [ -C ] [ -B ] dir"
+# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:D:nNf:U:CB"
# define UTMPS_DIR "utmps"
#else
-# define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] [ -n | -N ] [ -f skeldir ] dir"
-# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:D:nNf:"
+# define USAGE "s6-linux-init-maker [ -c basedir ] [ -u log_user ] [ -G early_getty_cmd ] [ -1 ] [ -L ] [ -p initial_path ] [ -m initial_umask ] [ -t timestamp_style ] [ -d slashdev ] [ -s env_store ] [ -e initial_envvar ... ] [ -q default_grace_time ] [ -D initdefault ] [ -n | -N ] [ -f skeldir ] [ -C ] [ -B ] dir"
+# define OPTION_STRING "c:u:G:1Lp:m:t:d:s:e:E:q:D:nNf:CB"
#endif
#define dieusage() strerr_dieusage(100, USAGE)
@@ -55,6 +55,8 @@ static unsigned int finalsleep = 3000 ;
static int mounttype = 1 ;
static int console = 0 ;
static int logouthookd = 0 ;
+static int inns = 0 ;
+static int nologger = 0 ;
#ifdef S6_LINUX_INIT_UTMPD_PATH
static char const *utmp_user = "utmp" ;
@@ -89,33 +91,61 @@ static int linewithargs_script (buffer *b, char const *line)
static int hpr_script (buffer *b, char const *what)
{
return put_shebang_options(b, "-S0")
- && buffer_puts(b, S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -") >= 0
- && buffer_puts(b, what) >= 0
- && buffer_puts(b, " $@\n") >= 0 ;
+ && buffer_puts(b, S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -") >= 0
+ && buffer_puts(b, what) >= 0
+ && buffer_puts(b, " $@\n") >= 0 ;
}
static int death_script (buffer *b, char const *s)
{
return put_shebang(b)
- && buffer_puts(b,
- EXECLINE_EXTBINPREFIX "redirfd -w 1 /dev/console\n"
- EXECLINE_EXTBINPREFIX "fdmove -c 2 1\n"
- EXECLINE_EXTBINPREFIX "foreground { "
- S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-echo -- \"s6-svscan ") >= 0
- && buffer_puts(b, s) >= 0
- && buffer_puts(b,
- ". Rebooting.\" }\n"
- S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -r -f\n") >= 0 ;
+ && buffer_puts(b,
+ EXECLINE_EXTBINPREFIX "redirfd -w 2 /dev/console\n"
+ EXECLINE_EXTBINPREFIX "fdmove -c 1 2\n"
+ EXECLINE_EXTBINPREFIX "foreground { "
+ S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-echo -- \"s6-svscan ") >= 0
+ && buffer_puts(b, s) >= 0
+ && buffer_puts(b,
+ ". Rebooting.\" }\n"
+ S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -fr\n") >= 0 ;
+}
+
+static int container_crash_script (buffer *b, char const *data)
+{
+ (void)data ;
+ return put_shebang(b)
+ && buffer_puts(b,
+ EXECLINE_EXTBINPREFIX "foreground\n{\n "
+ EXECLINE_EXTBINPREFIX "fdmove -c 1 2\n "
+ S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-echo -- \"s6-svscan crashed. Killing everything and exiting.\"\n}\n"
+ EXECLINE_EXTBINPREFIX "foreground { kill -9 -1 }\n"
+ EXECLINE_EXTBINPREFIX "wait { }\n"
+ S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -fnp\n") >= 0 ;
+}
+
+static int container_exit_script (buffer *b, char const *results)
+{
+ return put_shebang_options(b, "-S0")
+ && buffer_puts(b,
+ EXECLINE_EXTBINPREFIX "ifelse -X { test $1 = halt }\n{\n "
+ S6_EXTBINPREFIX "s6-envdir -- ") >= 0
+ && buffer_puts(b, results) >= 0
+ && buffer_puts(b, "\n "
+ EXECLINE_EXTBINPREFIX "importas -D0 -- EXITCODE exitcode\n "
+ EXECLINE_EXTBINPREFIX "exit $EXITCODE\n}\n"
+ EXECLINE_EXTBINPREFIX "ifte -X\n { "
+ S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -fnr }\n { "
+ S6_LINUX_INIT_EXTBINPREFIX "s6-linux-init-hpr -fnp }\n"
+ "test $1 = reboot\n") >= 0 ;
}
static int s6_svscan_log_script (buffer *b, char const *data)
{
size_t sabase = satmp.len ;
if (!put_shebang(b)
- || buffer_puts(b,
- EXECLINE_EXTBINPREFIX "redirfd -w 2 /dev/console\n"
- EXECLINE_EXTBINPREFIX "redirfd -w 1 /dev/") < 0
- || buffer_puts(b, console ? "console" : "null") < 0
+ || buffer_puts(b, console || inns ?
+ EXECLINE_EXTBINPREFIX "fdmove -c 1 2" :
+ EXECLINE_EXTBINPREFIX "redirfd -w 1 /dev/null") < 0
|| buffer_puts(b, "\n"
EXECLINE_EXTBINPREFIX "redirfd -rnb 0 " LOGGER_FIFO "\n"
S6_EXTBINPREFIX "s6-setuidgid ") < 0
@@ -156,6 +186,8 @@ static int shutdownd_script (buffer *b, char const *data)
satmp.len = sabase ;
if (buffer_puts(b, " -g ") < 0
|| buffer_put(b, fmt, uint_fmt(fmt, finalsleep)) < 0
+ || (inns && buffer_puts(b, " -C") < 0)
+ || (nologger && buffer_puts(b, " -B") < 0)
|| buffer_puts(b, "\n") < 0) return 0 ;
(void)data ;
return 1 ;
@@ -243,6 +275,8 @@ static inline int stage1_script (buffer *b, char const *data)
{
if (buffer_puts(b, " -N") < 0) return 0 ;
}
+ if (inns && buffer_puts(b, " -C") < 0) return 0 ;
+ if (nologger && buffer_puts(b, " -B") < 0) return 0 ;
if (buffer_puts(b, "\n") < 0) return 0 ;
(void)data ;
@@ -500,16 +534,8 @@ static inline void make_utmps (char const *base)
static inline void make_image (char const *base)
{
auto_dir(base, "run-image", 0, 0, 0755) ;
- {
- uid_t uid ;
- gid_t gid ;
- getug(base, log_user, &uid, &gid) ;
- auto_dir(base, "run-image/" UNCAUGHT_DIR, uid, gid, 02750) ;
- }
auto_dir(base, "run-image/" SCANDIR, 0, 0, 0755) ;
auto_dir(base, "run-image/" SCANDIR "/.s6-svscan", 0, 0, 0755) ;
- auto_script(base, "run-image/" SCANDIR "/.s6-svscan/crash", &death_script, "crashed") ;
- auto_script(base, "run-image/" SCANDIR "/.s6-svscan/finish", &death_script, "exited") ;
auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGTERM", &put_shebang_options, 0) ;
auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGHUP", &put_shebang_options, 0) ;
auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGQUIT", &put_shebang_options, 0) ;
@@ -517,18 +543,37 @@ static inline void make_image (char const *base)
auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGUSR1", &sig_script, "-p") ;
auto_script(base, "run-image/" SCANDIR "/.s6-svscan/SIGUSR2", &sig_script, "-h") ;
- auto_dir(base, "run-image/" SCANDIR "/" LOGGER_SERVICEDIR, 0, 0, 0755) ;
- auto_fifo(base, "run-image/" SCANDIR "/" LOGGER_SERVICEDIR "/" LOGGER_FIFO) ;
- auto_file(base, "run-image/" SCANDIR "/" LOGGER_SERVICEDIR "/notification-fd", "3\n", 2) ;
- auto_script(base, "run-image/" SCANDIR "/" LOGGER_SERVICEDIR "/run", &s6_svscan_log_script, 0) ;
+ if (!nologger)
+ {
+ uid_t uid ;
+ gid_t gid ;
+ getug(base, log_user, &uid, &gid) ;
+ auto_dir(base, "run-image/" UNCAUGHT_DIR, uid, gid, 02750) ;
+ auto_dir(base, "run-image/" SCANDIR "/" LOGGER_SERVICEDIR, 0, 0, 0755) ;
+ auto_fifo(base, "run-image/" SCANDIR "/" LOGGER_SERVICEDIR "/" LOGGER_FIFO) ;
+ auto_file(base, "run-image/" SCANDIR "/" LOGGER_SERVICEDIR "/notification-fd", "3\n", 2) ;
+ auto_script(base, "run-image/" SCANDIR "/" LOGGER_SERVICEDIR "/run", &s6_svscan_log_script, 0) ;
+ }
auto_dir(base, "run-image/" SCANDIR "/" SHUTDOWND_SERVICEDIR, 0, 0, 0755) ;
auto_fifo(base, "run-image/" SCANDIR "/" SHUTDOWND_SERVICEDIR "/" SHUTDOWND_FIFO) ;
auto_script(base, "run-image/" SCANDIR "/" SHUTDOWND_SERVICEDIR "/run", &shutdownd_script, 0) ;
- auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR, 0, 0, 0755) ;
- auto_file(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/notification-fd", "3\n", 2) ;
- auto_script(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/run", &runleveld_script, 0) ;
+ if (inns)
+ {
+ auto_script(base, "run-image/" SCANDIR "/.s6-svscan/crash", &container_crash_script, "") ;
+ auto_script(base, "run-image/" SCANDIR "/.s6-svscan/finish", &container_exit_script, S6_LINUX_INIT_TMPFS "/" CONTAINER_RESULTS) ;
+ auto_dir(base, "run-image/" CONTAINER_RESULTS, 0, 0, 0755) ;
+ auto_file(base, "run-image/" CONTAINER_RESULTS "/exitcode", "0\n", 2) ;
+ }
+ else
+ {
+ auto_script(base, "run-image/" SCANDIR "/.s6-svscan/crash", &death_script, "crashed") ;
+ auto_script(base, "run-image/" SCANDIR "/.s6-svscan/finish", &death_script, "exited") ;
+ auto_dir(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR, 0, 0, 0755) ;
+ auto_file(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/notification-fd", "3\n", 2) ;
+ auto_script(base, "run-image/" SCANDIR "/" RUNLEVELD_SERVICEDIR "/run", &runleveld_script, 0) ;
+ }
if (logouthookd)
{
@@ -551,7 +596,7 @@ static inline void make_image (char const *base)
static inline void make_scripts (char const *base)
{
auto_dir(base, "scripts", 0, 0, 0755) ;
- copy_script(base, "runlevel", 1) ;
+ if (!inns) copy_script(base, "runlevel", 1) ;
copy_script(base, STAGE2, 1) ;
copy_script(base, STAGE3, 1) ;
copy_script(base, STAGE4, 0) ;
@@ -565,7 +610,7 @@ static inline void make_bins (char const *base)
auto_script(base, "bin/poweroff", &hpr_script, "p") ;
auto_script(base, "bin/reboot", &hpr_script, "r") ;
auto_exec(base, "bin/shutdown", "s6-linux-init-shutdown") ;
- auto_exec(base, "bin/telinit", "s6-linux-init-telinit") ;
+ if (!inns) auto_exec(base, "bin/telinit", "s6-linux-init-telinit") ;
}
int main (int argc, char const *const *argv, char const *const *envp)
@@ -598,6 +643,8 @@ int main (int argc, char const *const *argv, char const *const *envp)
#ifdef S6_LINUX_INIT_UTMPD_PATH
case 'U' : utmp_user = l.arg ; break ;
#endif
+ case 'C' : inns = 1 ; break ;
+ case 'B' : nologger = 1 ; break ;
default : dieusage() ;
}
}
@@ -618,6 +665,8 @@ int main (int argc, char const *const *argv, char const *const *envp)
}
if (timestamp_style > 3)
strerr_dief1x(100, "-t timestamp_style must be 0, 1, 2 or 3") ;
+ if (inns && slashdev)
+ strerr_warnw1x("both -C and -d options given; are you sure your container does not come with a pre-mounted /dev?") ;
umask(0) ;
if (mkdir(argv[0], 0755) < 0)
diff --git a/src/init/s6-linux-init-telinit.c b/src/init/s6-linux-init-telinit.c
index 42441d6..cf05a7e 100644
--- a/src/init/s6-linux-init-telinit.c
+++ b/src/init/s6-linux-init-telinit.c
@@ -24,11 +24,13 @@ int main (int argc, char const *const *argv, char const *const *envp)
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- int opt = subgetopt_r(argc, argv, "c:p:s:m:d:D:", &l) ;
+ int opt = subgetopt_r(argc, argv, "CBc:p:s:m:d:D:", &l) ;
if (opt == -1) break ;
switch (opt)
{
- case 'c' : /* s6-linux-init may be called with these options, don't choke on them */
+ case 'C' : /* s6-linux-init may be called with these options, don't choke on them */
+ case 'B' :
+ case 'c' :
case 'p' :
case 's' :
case 'm' :
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c
index 78cf3d0..530093e 100644
--- a/src/init/s6-linux-init.c
+++ b/src/init/s6-linux-init.c
@@ -23,20 +23,53 @@
#include "defaults.h"
#include "initctl.h"
-#define USAGE "s6-linux-init [ -c basedir ] [ -p initpath ] [ -s envdumpdir ] [ -m umask ] [ -d devtmpfs ] [ -D initdefault ] [ -n | -N ]"
+#define USAGE "s6-linux-init [ -c basedir ] [ -p initpath ] [ -s envdumpdir ] [ -m umask ] [ -d devtmpfs ] [ -D initdefault ] [ -n | -N ] [ -C ] [ -B ]"
#define dieusage() strerr_dieusage(100, USAGE)
#define BANNER "\n s6-linux-init version " S6_LINUX_INIT_VERSION "\n\n"
+static int inns = 0 ;
+static int nologger = 0 ;
+static int notifpipe[2] ;
+
static inline char const *scan_cmdline (char const *initdefault, char const *const *argv, unsigned int argc)
{
- static char const *valid[] = { "default", "2", "3", "4", "5", 0 } ;
- for (unsigned int i = 0 ; i < argc ; i++)
- for (char const *const *p = valid ; *p ; p++)
- if (!strcmp(argv[i], *p)) return argv[i] ;
+ if (!inns)
+ {
+ static char const *valid[] = { "default", "2", "3", "4", "5", 0 } ;
+ for (unsigned int i = 0 ; i < argc ; i++)
+ for (char const *const *p = valid ; *p ; p++)
+ if (!strcmp(argv[i], *p)) return argv[i] ;
+ }
return initdefault ;
}
+static inline void wait_for_notif (int fd)
+{
+ char buf[16] ;
+ for (;;)
+ {
+ ssize_t r = read(fd, buf, 16) ;
+ if (r < 0) strerr_diefu1sys(111, "read from notification pipe") ;
+ if (!r)
+ {
+ strerr_warnw1x("s6-svscan failed to send a notification byte!") ;
+ break ;
+ }
+ if (memchr(buf, '\n', r)) break ;
+ }
+ close(fd) ;
+}
+
+static void disablecad (void)
+{
+ if (!inns)
+ {
+ if (reboot(RB_DISABLE_CAD) == -1)
+ strerr_warnwu1sys("trap ctrl-alt-del") ;
+ }
+}
+
static inline void run_stage2 (char const *basedir, char const **argv, unsigned int argc, char const *const *envp, size_t envlen, char const *modifs, size_t modiflen, char const *initdefault)
{
size_t dirlen = strlen(basedir) ;
@@ -51,11 +84,20 @@ static inline void run_stage2 (char const *basedir, char const **argv, unsigned
childargv[i+2] = argv[i] ;
childargv[argc + 2] = 0 ;
setsid() ;
- fd_close(1) ;
- if (open(LOGFIFO, O_WRONLY) != 1) /* blocks until catch-all logger is up */
- strerr_diefu1sys(111, "open " LOGFIFO " for writing") ;
- if (fd_copy(2, 1) == -1)
- strerr_diefu1sys(111, "fd_copy stdout to stderr") ;
+ if (nologger)
+ {
+ close(notifpipe[1]) ;
+ wait_for_notif(notifpipe[0]) ;
+ }
+ else
+ {
+ /* block on opening the log fifo until the catch-all logger is up */
+ close(1) ;
+ if (open(LOGFIFO, O_WRONLY) != 1)
+ strerr_diefu1sys(111, "open " LOGFIFO " for writing") ;
+ if (fd_copy(2, 1) == -1)
+ strerr_diefu1sys(111, "fd_copy stdout to stderr") ;
+ }
xpathexec_r(childargv, envp, envlen, modifs, modiflen) ;
}
@@ -74,15 +116,14 @@ int main (int argc, char const **argv, char const *const *envp)
if (getpid() != 1)
{
argv[0] = S6_LINUX_INIT_BINPREFIX "s6-linux-init-telinit" ;
- pathexec_run(argv[0], argv, envp) ;
- strerr_dieexec(111, argv[0]) ;
+ xpathexec_run(argv[0], argv, envp) ;
}
{
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
- int opt = subgetopt_r(argc, argv, "c:p:s:m:d:D:nN", &l) ;
+ int opt = subgetopt_r(argc, argv, "c:p:s:m:d:D:nNCB", &l) ;
if (opt == -1) break ;
switch (opt)
{
@@ -94,35 +135,60 @@ int main (int argc, char const **argv, char const *const *envp)
case 'D' : initdefault = l.arg ; break ;
case 'n' : mounttype = 2 ; break ;
case 'N' : mounttype = 0 ; break ;
+ case 'C' : inns = 1 ; break ;
+ case 'B' : nologger = 1 ; break ;
default : dieusage() ;
}
}
argc -= l.ind ; argv += l.ind ;
}
- allwrite(1, BANNER, sizeof(BANNER) - 1) ;
+ if (inns)
+ { /* If there's a Docker synchronization pipe, wait on it */
+ char c ;
+ ssize_t r = read(3, &c, 1) ;
+ if (r < 0)
+ {
+ if (errno != EBADF) strerr_diefu1sys(111, "read from fd 3") ;
+ }
+ else
+ {
+ if (r) strerr_warnw1x("parent wrote to fd 3!") ;
+ close(3) ;
+ }
+ }
+ else allwrite(1, BANNER, sizeof(BANNER) - 1) ;
if (chdir("/") == -1) strerr_diefu1sys(111, "chdir to /") ;
umask(mask) ;
setpgid(0, 0) ;
- fd_close(0) ;
+ close(0) ;
+
if (slashdev)
{
- fd_close(1) ;
- fd_close(2) ;
- if (mount("dev", slashdev, "devtmpfs", MS_NOSUID | MS_NOEXEC, "") == -1)
+ int nope, e ;
+ close(1) ;
+ close(2) ;
+ /* at this point we're totally in the dark, hoping /dev/console will work */
+ nope = mount("dev", slashdev, "devtmpfs", MS_NOSUID | MS_NOEXEC, "") < 0 ;
+ e = errno ;
+ if (open("/dev/console", O_WRONLY)
+ || fd_move(2, 0) < 0
+ || fd_copy(1, 2) < 0) return 111 ;
+ if (nope)
{
- int e = errno ;
- open("/dev/null", O_RDONLY) ;
- open("/dev/console", O_WRONLY) ;
- fd_copy(2, 1) ;
errno = e ;
- strerr_diefu2sys(111, "mount ", slashdev) ;
+ strerr_diefu1sys(111, "mount a devtmpfs on /dev") ;
}
- if (open("/dev/console", O_WRONLY)
- || fd_copy(1, 0) == -1
- || fd_move(2, 0) == -1) return 111 ;
}
- if (open("/dev/null", O_RDONLY)) strerr_diefu1sys(111, "open /dev/null") ;
+
+ if (open("/dev/null", O_RDONLY))
+ { /* ghetto /dev/null to the rescue */
+ int p[2] ;
+ strerr_warnwu1sys("open /dev/null") ;
+ if (pipe(p) < 0) strerr_diefu1sys(111, "pipe") ;
+ close(p[1]) ;
+ if (fd_move(0, p[0]) < 0) strerr_diefu1sys(111, "fd_move to stdin") ;
+ }
if (mounttype)
{
@@ -157,6 +223,8 @@ int main (int argc, char const **argv, char const *const *envp)
}
if (envdumpdir && !env_dump(envdumpdir, 0700, envp))
strerr_warnwu2sys("dump kernel environment to ", envdumpdir) ;
+
+ if (!nologger)
{
int fdr = open_read(LOGFIFO) ;
if (fdr == -1) strerr_diefu1sys(111, "open " LOGFIFO) ;
@@ -164,11 +232,13 @@ int main (int argc, char const **argv, char const *const *envp)
if (open(LOGFIFO, O_WRONLY) != 1) strerr_diefu1sys(111, "open " LOGFIFO) ;
fd_close(fdr) ;
}
+
{
- static char const *const newargv[5] = { S6_EXTBINPREFIX "s6-svscan", "-st0", "--", S6_LINUX_INIT_TMPFS "/" SCANDIR, 0 } ;
char const *newenvp[2] = { 0, 0 } ;
- pid_t pid ;
size_t pathlen = path ? strlen(path) : 0 ;
+ pid_t pid ;
+ char fmtfd[2 + UINT_FMT] = "-" ;
+ char const *newargv[6] = { S6_EXTBINPREFIX "s6-svscan", "-st0", fmtfd, "--", S6_LINUX_INIT_TMPFS "/" SCANDIR, 0 } ;
char pathvar[6 + pathlen] ;
if (path)
{
@@ -178,13 +248,27 @@ int main (int argc, char const **argv, char const *const *envp)
memcpy(pathvar + 5, path, pathlen + 1) ;
newenvp[0] = pathvar ;
}
+ if (nologger && pipe(notifpipe) < 0) strerr_diefu1sys(111, "pipe") ;
pid = fork() ;
if (pid == -1) strerr_diefu1sys(111, "fork") ;
if (!pid) run_stage2(basedir, argv, argc, newenvp, !!path, envmodifs.s, envmodifs.len, initdefault) ;
- if (reboot(RB_DISABLE_CAD) == -1)
- strerr_warnwu1sys("trap ctrl-alt-del") ;
- if (fd_copy(2, 1) == -1)
- strerr_diefu1sys(111, "redirect output file descriptor") ;
+ if (nologger)
+ {
+ close(notifpipe[0]) ;
+ fmtfd[1] = 'd' ;
+ fmtfd[2 + uint_fmt(fmtfd + 2, notifpipe[1])] = 0 ;
+ disablecad() ;
+ }
+ else
+ {
+ int fd = dup(2) ;
+ if (fd < 0) strerr_diefu1sys(111, "dup stderr") ;
+ fmtfd[1] = 'X' ;
+ fmtfd[2 + uint_fmt(fmtfd + 2, (unsigned int)fd)] = 0 ;
+ disablecad() ;
+ if (fd_copy(2, 1) == -1)
+ strerr_diefu1sys(111, "redirect output file descriptor") ;
+ }
xpathexec_r(newargv, newenvp, !!path, envmodifs.s, envmodifs.len) ;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 10:01:28 +0000