chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f53e67
)
man/systemctl: document enable on masked units
author
Jan Synacek
<jsynacek@redhat.com>
Wed, 8 Oct 2014 06:04:52 +0000
(08:04 +0200)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Wed, 8 Oct 2014 23:29:13 +0000
(19:29 -0400)
man/systemctl.xml
patch
|
blob
|
history
diff --git
a/man/systemctl.xml
b/man/systemctl.xml
index b2aa17f22b0ee7d35522b62799b8c6241e8ffb4e..61a23de7d7ef1150fd45e8978a313dcb50e29c52 100644
(file)
--- a/
man/systemctl.xml
+++ b/
man/systemctl.xml
@@
-924,6
+924,9
@@
kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
the system, or for all future logins of all users, or only this
boot. Note that in the last case, no systemd daemon
configuration is reloaded.</para>
the system, or for all future logins of all users, or only this
boot. Note that in the last case, no systemd daemon
configuration is reloaded.</para>
+
+ <para>Using <command>enable</command> on masked units
+ results in an error.</para>
</listitem>
</varlistentry>
</listitem>
</varlistentry>
@@
-1080,8
+1083,8
@@
kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
<filename>/dev/null</filename>, making it impossible to
start them. This is a stronger version of
<command>disable</command>, since it prohibits all kinds of
<filename>/dev/null</filename>, making it impossible to
start them. This is a stronger version of
<command>disable</command>, since it prohibits all kinds of
- activation of the unit, including
manual activation. Use
- this option with care. This honors the
+ 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>
</listitem>
<option>--runtime</option> option to only mask temporarily
until the next reboot of the system.</para>
</listitem>