static bool arg_all = false;
static bool arg_replace = false;
static bool arg_session = false;
-static bool arg_block = false;
+static bool arg_no_block = false;
static bool arg_immediate = false;
static bool arg_no_wtmp = false;
static bool arg_no_sync = false;
assert(method);
assert(name);
assert(mode);
- assert(!arg_block || s);
+ assert(arg_no_block || s);
dbus_error_init(&error);
goto finish;
}
- if (arg_block) {
+ if (!arg_no_block) {
const char *path;
char *p;
one_name = table[arg_action];
}
- if (arg_block) {
+ if (!arg_no_block) {
if ((r = enable_wait_for_jobs(bus)) < 0) {
log_error("Could not watch jobs: %s", strerror(-r));
goto finish;
goto finish;
}
- if (arg_block)
+ if (!arg_no_block)
r = wait_for_jobs(bus, s);
finish:
static int systemctl_help(void) {
- printf("%s [options]\n\n"
- "Send control commands to the init daemon.\n\n"
+ printf("%s [OPTIONS...] {COMMAND} ...\n\n"
+ "Send control commands to the systemd manager.\n\n"
" -h --help Show this help\n"
" -t --type=TYPE List only units of a particular type\n"
" -a --all Show all units, including dead ones\n"
" --replace When installing a new job, replace existing conflicting ones\n"
" --system Connect to system bus\n"
" --session Connect to session bus\n"
- " --block Wait until operation finished\n"
- " --no-wall Don't send wall message before reboot/halt/power-off\n\n"
+ " --no-block Do not wait until operation finished\n"
+ " --no-wall Don't send wall message before halt/power-off/reboot\n\n"
"Commands:\n"
" list-units List units\n"
" list-jobs List jobs\n"
" monitor Monitor unit/job changes\n"
" dump Dump server status\n"
" snapshot [NAME] Create a snapshot\n"
- " daemon-reload Reload init daemon configuration\n"
- " daemon-reexecute Reexecute init daemon\n"
- " daemon-exit Ask the init daemon to quit\n"
+ " daemon-reload Reload systemd manager configuration\n"
+ " daemon-reexec Reexecute systemd manager\n"
+ " daemon-exit Ask the systemd manager to quit\n"
" show-environment Dump environment\n"
" set-environment [NAME=VALUE...] Set one or more environment variables\n"
" unset-environment [NAME...] Unset one or more environment variables\n"
" halt Shut down and halt the system\n"
+ " poweroff Shut down and power-off the system\n"
" reboot Shut down and reboot the system\n"
- " poweroff Shut down and power off the system\n"
" default Enter default mode\n"
" rescue Enter rescue mode\n"
" emergency Enter emergency mode\n",
static int halt_help(void) {
- printf("%s [options]\n\n"
+ printf("%s [OPTIONS...]\n\n"
"%s the system.\n\n"
" --help Show this help\n"
" --halt Halt the machine\n"
" -p --poweroff Switch off the machine\n"
" --reboot Reboot the machine\n"
- " -f --force Force immediate reboot/halt/power-off\n"
- " -w --wtmp-only Don't reboot/halt/power-off, just write wtmp record\n"
+ " -f --force Force immediate halt/power-off/reboot\n"
+ " -w --wtmp-only Don't halt/power-off/reboot, just write wtmp record\n"
" -d --no-wtmp Don't write wtmp record\n"
- " -n --no-sync Don't sync before reboot/halt/power-off\n"
- " --no-wall Don't send wall message before reboot/halt/power-off\n",
+ " -n --no-sync Don't sync before halt/power-off/reboot\n"
+ " --no-wall Don't send wall message before halt/power-off/reboot\n",
program_invocation_short_name,
arg_action == ACTION_REBOOT ? "Reboot" :
arg_action == ACTION_POWEROFF ? "Power off" :
static int shutdown_help(void) {
- printf("%s [options] [now] [WALL...]\n\n"
+ printf("%s [OPTIONS...] [now] [WALL...]\n\n"
"Shut down the system.\n\n"
" --help Show this help\n"
" -H --halt Halt the machine\n"
" -P --poweroff Power-off the machine\n"
" -r --reboot Reboot the machine\n"
" -h Equivalent to --poweroff, overriden by --halt\n"
- " -k Don't reboot/halt/power-off, just send warnings\n"
- " --no-wall Don't send wall message before reboot/halt/power-off\n",
+ " -k Don't halt/power-off/reboot, just send warnings\n"
+ " --no-wall Don't send wall message before halt/power-off/reboot\n",
program_invocation_short_name);
return 0;
static int telinit_help(void) {
- printf("%s [options]\n\n"
+ printf("%s [OPTIONS...] {COMMAND}\n\n"
"Send control commands to the init daemon.\n\n"
" --help Show this help\n"
- " --no-wall Don't send wall message before reboot/halt/power-off\n\n"
+ " --no-wall Don't send wall message before halt/power-off/reboot\n\n"
"Commands:\n"
" 0 Power-off the machine\n"
" 6 Reboot the machine\n"
static int runlevel_help(void) {
- printf("%s [options]\n\n"
+ printf("%s [OPTIONS...]\n\n"
"Prints the previous and current runlevel of the init system.\n\n"
" --help Show this help\n",
program_invocation_short_name);
ARG_REPLACE = 0x100,
ARG_SESSION,
ARG_SYSTEM,
- ARG_BLOCK,
+ ARG_NO_BLOCK,
ARG_NO_WALL
};
static const struct option options[] = {
- { "help", no_argument, NULL, 'h' },
- { "type", required_argument, NULL, 't' },
- { "all", no_argument, NULL, 'a' },
- { "replace", no_argument, NULL, ARG_REPLACE },
- { "session", no_argument, NULL, ARG_SESSION },
- { "system", no_argument, NULL, ARG_SYSTEM },
- { "block", no_argument, NULL, ARG_BLOCK },
- { "no-wall", no_argument, NULL, ARG_NO_WALL },
- { NULL, 0, NULL, 0 }
+ { "help", no_argument, NULL, 'h' },
+ { "type", required_argument, NULL, 't' },
+ { "all", no_argument, NULL, 'a' },
+ { "replace", no_argument, NULL, ARG_REPLACE },
+ { "session", no_argument, NULL, ARG_SESSION },
+ { "system", no_argument, NULL, ARG_SYSTEM },
+ { "no-block", no_argument, NULL, ARG_NO_BLOCK },
+ { "no-wall", no_argument, NULL, ARG_NO_WALL },
+ { NULL, 0, NULL, 0 }
};
int c;
arg_session = false;
break;
- case ARG_BLOCK:
- arg_block = true;
+ case ARG_NO_BLOCK:
+ arg_no_block = true;
break;
case ARG_NO_WALL:
}
if (optind >= argc) {
- log_error("Argument missing.");
+ telinit_help();
return -EINVAL;
}