shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-25 18:50:18 +03:00
Code

systemctl: fix import-environment description, trim help to 80 cols

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-01-19 13:55:44 -05:00
parent 40f0b71b06
commit 3fb90db2d6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemctl.xml
View File

@ -1349,7 +1349,10 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
</listitem>
</varlistentry>
<varlistentry>
<term><command>import-environment <replaceable>VARIABLE</replaceable>...</command></term>
<term>
<command>import-environment</command>
<optional><replaceable>VARIABLE...</replaceable></optional>
</term>
<listitem>
<para>Import all, one or more environment variables set on

12
src/systemctl/systemctl.c
View File

@ -6002,8 +6002,8 @@ static void systemctl_help(void) {
" Operate on remote host\n"
" -M --machine=CONTAINER\n"
" Operate on local container\n"
" -t --type=TYPE List only units of a particular type\n"
" --state=STATE List only units with particular LOAD or SUB or ACTIVE state\n"
" -t --type=TYPE List units of a particular type\n"
" --state=STATE List units with particular LOAD or SUB or ACTIVE state\n"
" -p --property=NAME Show only properties by this name\n"
" -a --all Show all loaded units/properties, including dead/empty\n"
" ones. To list all units installed on the system, use\n"
@ -6021,8 +6021,7 @@ static void systemctl_help(void) {
" -q --quiet Suppress output\n"
" --no-block Do not wait until operation finished\n"
" --no-wall Don't send wall message before halt/power-off/reboot\n"
" --no-reload When enabling/disabling unit files, don't reload daemon\n"
" configuration\n"
" --no-reload Don't reload daemon after en-/dis-abling unit files\n"
" --no-legend Do not print a legend (column headers and hints)\n"
" --no-pager Do not pipe output into a pager\n"
" --no-ask-password\n"
@ -6031,8 +6030,7 @@ static void systemctl_help(void) {
" --runtime Enable unit files only temporarily until next reboot\n"
" -f --force When enabling unit files, override existing symlinks\n"
" When shutting down, execute action immediately\n"
" --preset-mode= Specifies whether fully apply presets, or only enable,\n"
" or only disable\n"
" --preset-mode= Apply only enable, only disable, or all presets\n"
" --root=PATH Enable unit files in the specified root directory\n"
" -n --lines=INTEGER Number of journal entries to show\n"
" -o --output=STRING Change journal output mode (short, short-iso,\n"
@ -6100,7 +6098,7 @@ static void systemctl_help(void) {
" 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"
" import-environment NAME... Import all, one or more environment variables\n\n"
" import-environment [NAME...] Import all or some environment variables\n\n"
"Manager Lifecycle Commands:\n"
" daemon-reload Reload systemd manager configuration\n"
" daemon-reexec Reexecute systemd manager\n\n"