diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-12 14:23:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 14:23:04 +0100 |
| commit | 9be3c605706cd8430e330e9d16df372f5daccce2 (patch) | |
| tree | b25c973b7469909c324a561ef25593a7dfb0baf7 /man | |
| parent | c108ee33bc326f1e30dceeb281773581798cd86e (diff) | |
| parent | 1830ac51a4ad1d82a198e587207df451b581c821 (diff) | |
| download | systemd-9be3c605706cd8430e330e9d16df372f5daccce2.tar.gz | |
Merge pull request #10892 from mbiebl/revert-systemctl-runtime-unmask-breakage
Revert "systemctl: when removing enablement or mask symlinks, cover both /run and /etc
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemctl.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml index 2be5a838e0..b9077c55a1 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -555,19 +555,19 @@ <term><option>--runtime</option></term> <listitem> - <para>When used with <command>set-property</command>, make changes only - temporarily, so that they are lost on the next reboot.</para> - - <para>Similarily, when used with <command>enable</command>, <command>mask</command>, - <command>edit</command> and related commands, make temporary changes, which are lost on - the next reboot. Changes are not made in subdirectories of <filename>/etc</filename>, but - in <filename>/run</filename>. The immediate effect is identical, however since the latter + <para>When used with <command>enable</command>, + <command>disable</command>, <command>edit</command>, + (and related commands), make changes only temporarily, so + that they are lost on the next reboot. This will have the + effect that changes are not made in subdirectories of + <filename>/etc</filename> but in <filename>/run</filename>, + with identical immediate effects, however, since the latter is lost on reboot, the changes are lost too.</para> - <para>Note: this option cannot be used with <command>disable</command>, - <command>unmask</command>, <command>preset</command>, or <command>preset-all</command>, - because those operations sometimes need to remove symlinks under <filename>/etc</filename> - to have the desired effect, which would cause a persistent change.</para> + <para>Similarly, when used with + <command>set-property</command>, make changes only + temporarily, so that they are lost on the next + reboot.</para> </listitem> </varlistentry> |