aboutsummaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-06-27 14:31:42 +0200
committerMichael Biebl <biebl@debian.org>2018-11-27 15:15:52 +0100
commit1830ac51a4ad1d82a198e587207df451b581c821 (patch)
tree88fde279be15582c3fea9901c5c4bc4f06a1b8bf /man
parentunit: minor optimization, use stack over heap, when we can (diff)
downloadsystemd-1830ac51a4ad1d82a198e587207df451b581c821.tar.gz
systemd-1830ac51a4ad1d82a198e587207df451b581c821.tar.bz2
systemd-1830ac51a4ad1d82a198e587207df451b581c821.zip
Revert "systemctl: when removing enablement or mask symlinks, cover both /run and /etc"
Having systemctl disable/unmask remove all symlinks in /etc and /run is unintuitive and breaks existing use cases. systemctl should behave symmetrically. A "systemctl --runtime unmask" should undo a "systemctl --runtime mask" action. Say you have a service, which was masked by the admin in /etc. If you temporarily want to mask the execution of the service (say in a script), you'd create a runtime mask via "systemctl --runtime mask". It is is now no longer possible to undo this temporary mask without nuking the admin changes, unless you start rm'ing files manually. While it is useful to be able to remove all enablement/mask symlinks in one go, this should be done via a separate command line switch, like "systemctl --all unmask". This reverts commit 4910b35078ad24dcbc63f372b2fee087640201d0. Fixes: #9393
Diffstat (limited to 'man')
-rw-r--r--man/systemctl.xml22
1 files changed, 11 insertions, 11 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 2be5a838e..b9077c55a 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>