summaryrefslogtreecommitdiffstats
path: root/src/core/main.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-04-05 14:10:04 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-04-05 22:18:31 +0200
commit03b3b55e117794701da47ec7d94b31aacb7eeb64 (patch)
tree06e7b20e660e6fb31f84325809417d09bb753256 /src/core/main.c
parenttest/check-help: check that --help and -h are identical (diff)
downloadsystemd-03b3b55e117794701da47ec7d94b31aacb7eeb64.tar.xz
systemd-03b3b55e117794701da47ec7d94b31aacb7eeb64.zip
pid1: make --help output fit in 80 columns
Diffstat (limited to '')
-rw-r--r--src/core/main.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 6567cdfb28..c6e9e9b034 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1075,9 +1075,8 @@ static int help(void) {
" -h --help Show this help\n"
" --version Show version\n"
" --test Determine initial transaction, dump it and exit\n"
- " --system In combination with --test: operate as system service manager\n"
- " --user In combination with --test: operate as per-user service manager\n"
- " --no-pager Do not pipe output into a pager\n"
+ " --system Combined with --test: operate in system mode\n"
+ " --user Combined with --test: operate in user mode\n"
" --dump-configuration-items Dump understood unit configuration items\n"
" --dump-bus-properties Dump exposed bus properties\n"
" --bus-introspect=PATH Write XML introspection data\n"
@@ -1087,14 +1086,17 @@ static int help(void) {
" --crash-reboot[=BOOL] Reboot on crash\n"
" --crash-shell[=BOOL] Run shell on crash\n"
" --confirm-spawn[=BOOL] Ask for confirmation when spawning processes\n"
- " --show-status[=BOOL] Show status updates on the console during bootup\n"
- " --log-target=TARGET Set log target (console, journal, kmsg, journal-or-kmsg, null)\n"
- " --log-level=LEVEL Set log level (debug, info, notice, warning, err, crit, alert, emerg)\n"
+ " --show-status[=BOOL] Show status updates on the console during boot\n"
+ " --log-target=TARGET Set log target (console, journal, kmsg,\n"
+ " journal-or-kmsg, null)\n"
+ " --log-level=LEVEL Set log level (debug, info, notice, warning,\n"
+ " err, crit, alert, emerg)\n"
" --log-color[=BOOL] Highlight important log messages\n"
" --log-location[=BOOL] Include code location in log messages\n"
" --log-time[=BOOL] Prefix log messages with current time\n"
" --default-standard-output= Set default standard output for services\n"
" --default-standard-error= Set default standard error output for services\n"
+ " --no-pager Do not pipe output into a pager\n"
"\nSee the %s for details.\n",
program_invocation_short_name,
ansi_highlight(),