diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-04-28 16:42:11 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-04-28 16:42:11 +0000 |
| commit | 1c31b92725f8c121bed55d2f7446d6c7e7f7824e (patch) | |
| tree | 1b8ffe4ecc4689d071eaa1a07556268d587b9513 | |
| parent | e433e4088f0990009f9bb78757ad145317ba91ec (diff) | |
| download | s6-linux-init-1c31b92725f8c121bed55d2f7446d6c7e7f7824e.tar.xz | |
Fix stage2 and stage3 invocation paths
| -rw-r--r-- | src/init/s6-linux-init.c | 5 | ||||
| -rw-r--r-- | src/shutdown/s6-linux-init-shutdownd.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c index 5223d54..b589ec3 100644 --- a/src/init/s6-linux-init.c +++ b/src/init/s6-linux-init.c @@ -41,12 +41,11 @@ static inline void run_stage2 (char const *basedir, char const **argv, unsigned { size_t dirlen = strlen(basedir) ; char const *childargv[argc + 3] ; - char fn[dirlen + 1 + sizeof(STAGE2)] ; + char fn[dirlen + sizeof("/scripts/" STAGE2)] ; PROG = "s6-linux-init (child)" ; argv[0] = PROG ; memcpy(fn, basedir, dirlen) ; - fn[dirlen] = '/' ; - memcpy(fn + dirlen + 1, STAGE2, sizeof(STAGE2)) ; + memcpy(fn + dirlen, "/scripts/" STAGE2, sizeof("/scripts/" STAGE2)) ; childargv[0] = fn ; childargv[1] = scan_cmdline(initdefault, argv + 1, argc - 1) ; for (unsigned int i = 0 ; i < argc ; i++) diff --git a/src/shutdown/s6-linux-init-shutdownd.c b/src/shutdown/s6-linux-init-shutdownd.c index 90d43e8..c01727d 100644 --- a/src/shutdown/s6-linux-init-shutdownd.c +++ b/src/shutdown/s6-linux-init-shutdownd.c @@ -40,10 +40,10 @@ static inline void run_stage3 (char const *basedir, char const *const *envp) { pid_t pid ; size_t basedirlen = strlen(basedir) ; - char stage3[basedirlen + sizeof("/" STAGE3)] ; + char stage3[basedirlen + sizeof("/scripts/" STAGE3)] ; char const *stage3_argv[2] = { stage3, 0 } ; memcpy(stage3, basedir, basedirlen) ; - memcpy(stage3 + basedirlen, "/" STAGE3, sizeof("/" STAGE3)) ; + memcpy(stage3 + basedirlen, "/scripts/" STAGE3, sizeof("/scripts/" STAGE3)) ; pid = child_spawn0(stage3_argv[0], stage3_argv, envp) ; if (pid) { |