summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-27 21:22:57 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-27 21:48:12 -0500
commitb57b06258e0b1894edb6d1fc52a80b3c33164892 (patch)
treea9be974637511b42883029792e8c376c7629a837
parent79ca888f5ad026b5b3844c05a80401905e64e2f0 (diff)
notify,firstboot,analyze,run: trim --help output to 80 lines
-rw-r--r--src/analyze/analyze.c17
-rw-r--r--src/firstboot/firstboot.c2
-rw-r--r--src/notify/notify.c12
-rw-r--r--src/run/run.c10
4 files changed, 19 insertions, 22 deletions
diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 6a6855148e..46a97eb8e7 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1195,18 +1195,15 @@ static void help(void) {
" --user Operate on user systemd instance\n"
" -H --host=[USER@]HOST Operate on remote host\n"
" -M --machine=CONTAINER Operate on local container\n"
- " --order When generating a dependency graph, show only order\n"
- " --require When generating a dependency graph, show only requirement\n"
- " --from-pattern=GLOB, --to-pattern=GLOB\n"
- " When generating a dependency graph, filter only origins\n"
- " or destinations, respectively\n"
- " --fuzz=TIMESPAN When printing the tree of the critical chain, print also\n"
- " services, which finished TIMESPAN earlier, than the\n"
- " latest in the branch. The unit of TIMESPAN is seconds\n"
- " unless specified with a different unit, i.e. 50ms\n"
+ " --order Show only order in the graph\n"
+ " --require Show only requirement in the graph\n"
+ " --from-pattern=GLOB Show only origins in the graph\n"
+ " --to-pattern=GLOB Show only destinations in the graph\n"
+ " --fuzz=SECONDS Also print also services which finished SECONDS\n"
+ " earlier than the latest in the branch\n"
" --man[=BOOL] Do [not] check for existence of man pages\n\n"
"Commands:\n"
- " time Print time spent in the kernel before reaching userspace\n"
+ " time Print time spent in the kernel\n"
" blame Print list of running units ordered by time to init\n"
" critical-chain Print a tree of the time critical chain of units\n"
" plot Output SVG graphic showing service initialization\n"
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index ce79574b90..a160c52fee 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -631,7 +631,7 @@ static void help(void) {
" --prompt-timezone Prompt the user for timezone\n"
" --prompt-hostname Prompt the user for hostname\n"
" --prompt-root-password Prompt the user for root password\n"
- " --prompt Prompt for locale, timezone, hostname, root password\n"
+ " --prompt Prompt for all of the above\n"
" --copy-locale Copy locale from host\n"
" --copy-timezone Copy timezone from host\n"
" --copy-root-password Copy root password from host\n"
diff --git a/src/notify/notify.c b/src/notify/notify.c
index 5bf901ec6a..f98075d513 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -42,12 +42,12 @@ static bool arg_booted = false;
static void help(void) {
printf("%s [OPTIONS...] [VARIABLE=VALUE...]\n\n"
"Notify the init system about service status updates.\n\n"
- " -h --help Show this help\n"
- " --version Show package version\n"
- " --ready Inform the init system about service start-up completion\n"
- " --pid[=PID] Set main pid of daemon\n"
- " --status=TEXT Set status text\n"
- " --booted Returns 0 if the system was booted up with systemd, non-zero otherwise\n",
+ " -h --help Show this help\n"
+ " --version Show package version\n"
+ " --ready Inform the init system about service start-up completion\n"
+ " --pid[=PID] Set main pid of daemon\n"
+ " --status=TEXT Set status text\n"
+ " --booted Check if the system was booted up with systemd\n",
program_invocation_short_name);
}
diff --git a/src/run/run.c b/src/run/run.c
index d6d0b42d15..723e0cb31a 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -86,11 +86,11 @@ static void help(void) {
" -t --pty Run service on pseudo tty\n"
" -q --quiet Suppress information messages during runtime\n\n"
"Timer options:\n\n"
- " --on-active=SEC Run after seconds\n"
- " --on-boot=SEC Run after seconds from machine was booted up\n"
- " --on-startup=SEC Run after seconds from systemd was first started\n"
- " --on-unit-active=SEC Run after seconds from the last activation\n"
- " --on-unit-inactive=SEC Run after seconds from the last deactivation\n"
+ " --on-active=SECONDS Run after SECONDS delay\n"
+ " --on-boot=SECONDS Run SECONDS after machine was booted up\n"
+ " --on-startup=SECONDS Run SECONDS after systemd activation\n"
+ " --on-unit-active=SECONDS Run SECONDS after the last activation\n"
+ " --on-unit-inactive=SECONDS Run SECONDS after the last deactivation\n"
" --on-calendar=SPEC Realtime timer\n"
" --timer-property=NAME=VALUE Set timer unit property\n",
program_invocation_short_name);