diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-09-23 19:13:22 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-09-23 19:13:22 +0000 |
| commit | 047befef9b8ef074d34b05e294d753f6c2751987 (patch) | |
| tree | ee0d7329e2abd0b0d24efd14bc25e84f25e48230 /src | |
| parent | b7ab058ecf940dc3c6b5a1ce2d45d9bd6bd293fa (diff) | |
| download | s6-rc-047befef9b8ef074d34b05e294d753f6c2751987.tar.xz | |
No need for -a in s6-rc -u invocation; remove -X from dryrun print
Diffstat (limited to 'src')
| -rw-r--r-- | src/s6-rc/s6-rc-update.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/s6-rc/s6-rc-update.c b/src/s6-rc/s6-rc-update.c index 6704e93..66c956f 100644 --- a/src/s6-rc/s6-rc-update.c +++ b/src/s6-rc/s6-rc-update.c @@ -753,7 +753,7 @@ int main (int argc, char const *const *argv, char const *const *envp) /* Down transition */ { - char const *newargv[11 + (dryrun * 5) + want_count(oldstate, oldn)] ; + char const *newargv[12 + (dryrun * 4) + want_count(oldstate, oldn)] ; unsigned int m = 0, i = oldn ; int wstat ; char vfmt[UINT_FMT] ; @@ -775,7 +775,8 @@ int main (int argc, char const *const *argv, char const *const *envp) newargv[m++] = tfmt ; newargv[m++] = "-l" ; newargv[m++] = live ; - newargv[m++] = "-Xd" ; + if (!dryrun) newargv[m++] = "-X" ; + newargv[m++] = "-d" ; newargv[m++] = "--" ; newargv[m++] = "change" ; while (i--) if (oldstate[i] & 2) @@ -818,7 +819,7 @@ int main (int argc, char const *const *argv, char const *const *envp) /* Up transition */ { - char const *newargv[11 + (dryrun * 5) + want_count(newstate, newn)] ; + char const *newargv[12 + (dryrun * 4) + want_count(newstate, newn)] ; unsigned int m = 0, i = newn ; char vfmt[UINT_FMT] ; char tfmt[UINT_FMT] ; @@ -839,7 +840,8 @@ int main (int argc, char const *const *argv, char const *const *envp) newargv[m++] = tfmt ; newargv[m++] = "-l" ; newargv[m++] = live ; - newargv[m++] = "-Xua" ; + if (!dryrun) newargv[m++] = "-X" ; + newargv[m++] = "-u" ; newargv[m++] = "--" ; newargv[m++] = "change" ; while (i--) if (newstate[i] & 2) |