diff options
author | Jan Synacek <jsynacek@redhat.com> | 2015-05-15 09:54:10 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-05-15 11:59:36 +0200 |
commit | 57ab2eabb8f92fad5239c7d4492e9c6e23ee0678 (patch) | |
tree | 65bea45689f9273f7cc593f226212e51ee76fb05 /man/systemctl.xml | |
parent | nspawn: allow access to device nodes listed in --bind= and --bind-ro= switches (diff) | |
download | systemd-57ab2eabb8f92fad5239c7d4492e9c6e23ee0678.tar.xz systemd-57ab2eabb8f92fad5239c7d4492e9c6e23ee0678.zip |
systemctl: introduce --now for enable, disable and mask
https://bugs.freedesktop.org/show_bug.cgi?id=42940
Diffstat (limited to 'man/systemctl.xml')
-rw-r--r-- | man/systemctl.xml | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index 4dbdfe1556..dd9e5c571f 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -456,6 +456,18 @@ </varlistentry> <varlistentry> + <term><option>--now</option></term> + + <listitem> + <para>When used with <command>enable</command>, the units + will also be started. When used with <command>disable</command> or + <command>mask</command>, the units will also be stopped. The start + or stop operation is only carried out when the respective enable or + disable operation has been successful.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><option>--root=</option></term> <listitem> @@ -921,11 +933,12 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service the changes are taken into account immediately. Note that this does <emphasis>not</emphasis> have the effect of also starting any of the units being enabled. If this - is desired, a separate <command>start</command> command must - be invoked for the unit. Also note that in case of instance - enablement, symlinks named the same as instances are created in - the install location, however they all point to the same - template unit file.</para> + is desired, either <option>--now</option> should be used + together with this command, or an additional <command>start</command> + command must be invoked for the unit. Also note that in case of + instance enablement, symlinks named the same as instances + are created in the install location, however they all point to the + same template unit file.</para> <para>This command will print the actions executed. This output may be suppressed by passing <option>--quiet</option>. @@ -980,9 +993,10 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service <command>enable</command>. This call implicitly reloads the systemd daemon configuration after completing the disabling of the units. Note that this command does not implicitly - stop the units that are being disabled. If this is desired, - an additional <command>stop</command> command should be - executed afterwards.</para> + stop the units that are being disabled. If this is desired, either + <option>--now</option> should be used together with this command, or + an additional <command>stop</command> command should be executed + afterwards.</para> <para>This command will print the actions executed. This output may be suppressed by passing <option>--quiet</option>. @@ -1128,7 +1142,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service activation of the unit, including enablement and manual activation. Use this option with care. This honors the <option>--runtime</option> option to only mask temporarily - until the next reboot of the system.</para> + until the next reboot of the system. The <option>--now</option> + option can be used to ensure that the units are also stopped.</para> </listitem> </varlistentry> |