diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/s6-frontend/set.help.txt | 4 | ||||
| -rw-r--r-- | src/s6-frontend/set_change.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/s6-frontend/set.help.txt b/src/s6-frontend/set.help.txt index 20deb73..362ee9f 100644 --- a/src/s6-frontend/set.help.txt +++ b/src/s6-frontend/set.help.txt @@ -5,7 +5,7 @@ Subcommands: save save the current set under a user-provided name load load a previously saved set list list services in the working set - status list services in the working set with their sub + status list services in the working set with their rx enable enable services disable disable services mask mask services (hide them from the db entirely) @@ -28,7 +28,7 @@ s6 set status options: s6 set enable|disable|mask|unmask options: -f --ignore-dependencies only change listed services -n --dry-run show what would happen, don't do - -I WHAT --if-dependencies-found=WHAT WHAT=warn (default) | fail | pull (dependencies will be brought to the same sub) + -I WHAT --if-dependencies-found=WHAT WHAT=warn (default) | fail | pull (dependencies will be brought to the same rx) s6 set check options: -E --no-force-essential do not allow manual changes to essential services (default) diff --git a/src/s6-frontend/set_change.c b/src/s6-frontend/set_change.c index 4017329..64b6fbf 100644 --- a/src/s6-frontend/set_change.c +++ b/src/s6-frontend/set_change.c @@ -21,8 +21,8 @@ enum gola_e GOLA_N } ; -static void set_change (char const *const *argv, char const *newsub, char const *cmd) gccattr_noreturn ; -static void set_change (char const *const *argv, char const *newsub, char const *cmd) +static void set_change (char const *const *argv, char const *newrx, char const *cmd) gccattr_noreturn ; +static void set_change (char const *const *argv, char const *newrx, char const *cmd) { static gol_bool const rgolb[] = { @@ -68,10 +68,10 @@ static void set_change (char const *const *argv, char const *newsub, char const newargv[m++] = "-I" ; newargv[m++] = wgola[GOLA_FORCELEVEL] ; } - if (!strcmp(newsub, "always")) newargv[m++] = "-e" ; + if (!strcmp(newrx, "always")) newargv[m++] = "-e" ; newargv[m++] = "--" ; newargv[m++] = "current" ; - newargv[m++] = newsub ; + newargv[m++] = newrx ; for (unsigned int i = 0 ; i < argc ; i++) newargv[m++] = argv[i] ; newargv[m++] = 0 ; |