diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-06-11 11:58:38 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-06-11 11:58:38 +0000 |
| commit | 8c4efa9762647edc9cbf75d4239ca05ff484fd51 (patch) | |
| tree | a66680f593a3bc013d7337c00f992eaff27b36e0 | |
| parent | 5fbf98106a24931071e2faf84cb9c39455cbb6d7 (diff) | |
| download | s6-rc-8c4efa9762647edc9cbf75d4239ca05ff484fd51.tar.xz | |
Fix s6-* and s6-rc-* prefix invocations
| -rw-r--r-- | package/deps.mak | 2 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/s6-rc/s6-rc.c | 13 |
3 files changed, 9 insertions, 8 deletions
diff --git a/package/deps.mak b/package/deps.mak index 73215d7..6f9d19f 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -14,7 +14,7 @@ src/s6-rc/s6-rc-compile.o src/s6-rc/s6-rc-compile.lo: src/s6-rc/s6-rc-compile.c src/s6-rc/s6-rc-db.o src/s6-rc/s6-rc-db.lo: src/s6-rc/s6-rc-db.c src/include/s6-rc/s6rc.h src/s6-rc/s6-rc-dryrun.o src/s6-rc/s6-rc-dryrun.lo: src/s6-rc/s6-rc-dryrun.c src/s6-rc/s6-rc-init.o src/s6-rc/s6-rc-init.lo: src/s6-rc/s6-rc-init.c src/include/s6-rc/s6rc.h -src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/s6rc.h +src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h libs6rc.a: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_graph_closure.o libs6rc.so: src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_graph_closure.lo diff --git a/package/info b/package/info index 1a67009..6e76da4 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-rc version=0.0.1.0 category=admin -package_macro_name=S6_RC +package_macro_name=S6RC diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c index d83f77d..68bfcca 100644 --- a/src/s6-rc/s6-rc.c +++ b/src/s6-rc/s6-rc.c @@ -20,6 +20,7 @@ #include <skalibs/iopause.h> #include <skalibs/unix-transactional.h> #include <s6/config.h> +#include <s6-rc/config.h> #include <s6-rc/s6rc.h> #define USAGE "s6-rc [ -v verbosity ] [ -n dryruntimeout ] [ -t timeout ] [ -l live ] [ -u | -d ] [ -p ] [ -a ] [ -C ] [ -L ] [ -A ] [ -S ] servicenames..." @@ -94,13 +95,13 @@ static pid_t start_oneshot (unsigned int i, int h) fmt[uint32_fmt(fmt, db->services[i].timeout[h])] = 0 ; if (dryrun[0]) { - newargv[m++] = S6_BINPREFIX "s6-rc-dryrun" ; + newargv[m++] = S6RC_BINPREFIX "s6-rc-dryrun" ; newargv[m++] = "-t" ; newargv[m++] = dryrun ; newargv[m++] = "--" ; } - newargv[m++] = S6_BINPREFIX "s6-sudo" ; - newargv[m++] = verbosity >= 2 ? "-vel0" : "-el0" ; + newargv[m++] = S6_EXTBINPREFIX "s6-sudo" ; + newargv[m++] = verbosity >= 3 ? "-vel0" : "-el0" ; newargv[m++] = "-t" ; newargv[m++] = "2000" ; newargv[m++] = "-T" ; @@ -126,18 +127,18 @@ static pid_t start_longrun (unsigned int i, int h) fmt[uint32_fmt(fmt, db->services[i].timeout[h])] = 0 ; if (dryrun[0]) { - newargv[m++] = S6_BINPREFIX "s6-rc-dryrun" ; + newargv[m++] = S6RC_BINPREFIX "s6-rc-dryrun" ; newargv[m++] = "-t" ; newargv[m++] = dryrun ; newargv[m++] = "--" ; } - newargv[m++] = S6_BINPREFIX "s6-svlisten1" ; + newargv[m++] = S6_EXTBINPREFIX "s6-svlisten1" ; newargv[m++] = h ? "-U" : "-d" ; newargv[m++] = "-t" ; newargv[m++] = fmt ; newargv[m++] = "--" ; newargv[m++] = servicefn ; - newargv[m++] = S6_BINPREFIX "s6-svc" ; + newargv[m++] = S6_EXTBINPREFIX "s6-svc" ; newargv[m++] = h ? "-u" : "-d" ; newargv[m++] = "--" ; newargv[m++] = servicefn ; |