diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-04-28 23:48:26 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-04-28 23:48:26 +0000 |
| commit | 26f83a95417ff2e5866d6fefab4d737509761622 (patch) | |
| tree | 004320a4e34db14876925580a77a972a69bd6fde /src/init/s6-linux-init.c | |
| parent | e5512f97985e8ce0798437750fa635dd1c3b02d9 (diff) | |
| download | s6-linux-init-26f83a95417ff2e5866d6fefab4d737509761622.tar.xz | |
More bugfixes, glibc multilib workaround
Diffstat (limited to 'src/init/s6-linux-init.c')
| -rw-r--r-- | src/init/s6-linux-init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/init/s6-linux-init.c b/src/init/s6-linux-init.c index b589ec3..b6113a9 100644 --- a/src/init/s6-linux-init.c +++ b/src/init/s6-linux-init.c @@ -47,7 +47,7 @@ static inline void run_stage2 (char const *basedir, char const **argv, unsigned memcpy(fn, basedir, dirlen) ; memcpy(fn + dirlen, "/scripts/" STAGE2, sizeof("/scripts/" STAGE2)) ; childargv[0] = fn ; - childargv[1] = scan_cmdline(initdefault, argv + 1, argc - 1) ; + childargv[1] = scan_cmdline(initdefault, argv, argc) ; for (unsigned int i = 0 ; i < argc ; i++) childargv[i+2] = argv[i] ; childargv[argc + 2] = 0 ; @@ -73,7 +73,7 @@ int main (int argc, char const **argv, char const *const *envp) if (getpid() != 1) { - argv[0] = S6_LINUX_INIT_BINPREFIX "/s6-linux-init-telinit" ; + argv[0] = S6_LINUX_INIT_BINPREFIX "s6-linux-init-telinit" ; pathexec_run(argv[0], argv, envp) ; strerr_dieexec(111, argv[0]) ; } |