diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2017-08-22 15:31:56 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2017-08-22 15:31:56 +0000 |
| commit | abb7c490bcb70cbfbf909e36ea908bcdf81ddf95 (patch) | |
| tree | d30e9301f288024f46a23e095c3f85ec754509fe | |
| parent | 83cd31ed0679300cb7ac9335785f1b3ec9633712 (diff) | |
| download | s6-rc-abb7c490bcb70cbfbf909e36ea908bcdf81ddf95.tar.xz | |
More conversion to xpathexec
| -rw-r--r-- | doc/s6-rc-oneshot-run.html | 2 | ||||
| -rw-r--r-- | doc/s6-rc-update.html | 2 | ||||
| -rw-r--r-- | src/s6-rc/s6-rc-oneshot-run.c | 3 | ||||
| -rw-r--r-- | src/s6-rc/s6-rc-update.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/doc/s6-rc-oneshot-run.html b/doc/s6-rc-oneshot-run.html index 49ed63b..0a1aa35 100644 --- a/doc/s6-rc-oneshot-run.html +++ b/doc/s6-rc-oneshot-run.html @@ -63,6 +63,8 @@ is currently in use. </li> <li> 4: invalid service database </li> <li> 100: wrong usage </li> <li> 111: system call failed </li> + <li> 126: cannot exec script </li> + <li> 127: cannot exec script: executable not found </li> <li> other exit codes: returned from the executed <tt>up</tt> or <tt>down</tt> script </li> </ul> diff --git a/doc/s6-rc-update.html b/doc/s6-rc-update.html index 165f8de..6c23975 100644 --- a/doc/s6-rc-update.html +++ b/doc/s6-rc-update.html @@ -69,6 +69,8 @@ live compiled service database. </li> <li> 10: timed out, and the database was not switched </li> <li> 100: wrong usage </li> <li> 111: system call failed </li> + <li> 126: cannot exec into s6-rc for the final "up" transition (error other than ENOENT) </li> + <li> 127: cannot exec into s6-rc for the final "up" transition (executable not found) </li> </ul> <h2> Options </h2> diff --git a/src/s6-rc/s6-rc-oneshot-run.c b/src/s6-rc/s6-rc-oneshot-run.c index 9b48a33..9cbcca9 100644 --- a/src/s6-rc/s6-rc-oneshot-run.c +++ b/src/s6-rc/s6-rc-oneshot-run.c @@ -98,8 +98,7 @@ int main (int argc, char const *const *argv, char const *const *envp) char const **p = newargv ; while (sargc--) *p++ = *sargv++ ; *p = 0 ; - pathexec0_run(newargv, envp) ; - strerr_dieexec(111, newargv[0]) ; + xpathexec0_run(newargv, envp) ; } } } diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c index 5f4d25e..a6e7cfe 100644 --- a/src/s6-rc/s6-rc-update.c +++ b/src/s6-rc/s6-rc-update.c @@ -839,8 +839,7 @@ int main (int argc, char const *const *argv, char const *const *envp) newargv[m++] = 0 ; if (verbosity >= 2) strerr_warni1x("starting services in the new database") ; - pathexec_run(newargv[0], newargv, envp) ; - strerr_dieexec(111, newargv[0]) ; + xpathexec_run(newargv[0], newargv, envp) ; } } } |