diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-10-14 17:23:22 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-10-14 17:23:22 +0000 |
| commit | 179829aa7b2e275f17c4f8ac465cbfabf0ff7f9b (patch) | |
| tree | 00b64f7867bdaba5fe63632bb607e5a76da1c065 | |
| parent | 7530014a3f607db7dbee656b7451d3e0a0ff3f46 (diff) | |
| download | s6-179829aa7b2e275f17c4f8ac465cbfabf0ff7f9b.tar.xz | |
- update AUTHORS list
- s6-setlock bugfix: find s6lockd-helper in libexec
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | src/daemontools-extras/s6-setlock.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -20,3 +20,5 @@ Thanks to: Patrick Mahoney <pat@polycrystal.org> Roy Lanek <roy.lanek@gmail.com> Gorka Lertxundi <glertxundi@gmail.com> + Buck Evan <buck@yelp.com> + John O'Meara <john.fr.omeara@gmail.com> diff --git a/src/daemontools-extras/s6-setlock.c b/src/daemontools-extras/s6-setlock.c index 2fb6f12..f2ce79e 100644 --- a/src/daemontools-extras/s6-setlock.c +++ b/src/daemontools-extras/s6-setlock.c @@ -61,8 +61,8 @@ int main (int argc, char const *const *argv, char const *const *envp) if (!tain_now_g()) strerr_diefu1sys(111, "tain_now") ; tain_from_millisecs(&deadline, timeout) ; tain_add_g(&deadline, &deadline) ; - pid = child_spawn(S6_BINPREFIX "s6lockd-helper", cargv, cenvp, p, 2) ; - if (!pid) strerr_diefu2sys(111, "spawn ", S6_BINPREFIX "s6lockd-helper") ; + pid = child_spawn(S6_LIBEXECPREFIX "s6lockd-helper", cargv, cenvp, p, 2) ; + if (!pid) strerr_diefu2sys(111, "spawn ", S6_LIBEXECPREFIX "s6lockd-helper") ; x.fd = p[0] ; for (;;) { |