From 6f9dc69704211a6123b225036bffb46c1a2d6e83 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 31 Jan 2019 20:33:42 +0000 Subject: Make "s6-svc -wu foo" wait for foo to be up. Document supervise/ creation. --- src/supervision/s6-svc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/supervision') diff --git a/src/supervision/s6-svc.c b/src/supervision/s6-svc.c index ee7ddc5..6a5d64b 100644 --- a/src/supervision/s6-svc.c +++ b/src/supervision/s6-svc.c @@ -69,7 +69,6 @@ int main (int argc, char const *const *argv, char const *const *envp) if (!argc) dieusage() ; if (argc > 1) strerr_warn1x("ignoring extra arguments") ; - if (datalen <= 1) return 0 ; if (updown[1] == 'U' || updown[1] == 'R') { size_t arglen = strlen(argv[0]) ; @@ -89,7 +88,7 @@ int main (int argc, char const *const *argv, char const *const *envp) char const *newargv[11] ; unsigned int m = 0 ; char fmt[UINT_FMT] ; - newargv[m++] = S6_BINPREFIX "s6-svlisten1" ; + newargv[m++] = datalen > 1 ? S6_BINPREFIX "s6-svlisten1" : S6_BINPREFIX "s6-svwait" ; newargv[m++] = updown ; if (timeout) { @@ -99,10 +98,13 @@ int main (int argc, char const *const *argv, char const *const *envp) } newargv[m++] = "--" ; newargv[m++] = argv[0] ; - newargv[m++] = S6_BINPREFIX "s6-svc" ; - newargv[m++] = data ; - newargv[m++] = "--" ; - newargv[m++] = argv[0] ; + if (datalen > 1) + { + newargv[m++] = S6_BINPREFIX "s6-svc" ; + newargv[m++] = data ; + newargv[m++] = "--" ; + newargv[m++] = argv[0] ; + } newargv[m++] = 0 ; xpathexec_run(newargv[0], newargv, envp) ; } -- cgit v1.2.3