naccyde / rpms / systemd

Forked from rpms/systemd a year ago
Clone
84b277
From 091b32bd93acd3e7be844684771ab2248b97637b Mon Sep 17 00:00:00 2001
84b277
From: Jan Synacek <jsynacek@redhat.com>
84b277
Date: Wed, 8 Oct 2014 13:43:02 +0200
84b277
Subject: [PATCH] man/systemctl: document enable on masked units
84b277
84b277
Related: #1149299
84b277
---
84b277
 man/systemctl.xml | 7 +++++--
84b277
 1 file changed, 5 insertions(+), 2 deletions(-)
84b277
84b277
diff --git a/man/systemctl.xml b/man/systemctl.xml
84b277
index d2430ee..b894511 100644
84b277
--- a/man/systemctl.xml
84b277
+++ b/man/systemctl.xml
84b277
@@ -862,6 +862,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
84b277
             the system, or for all future logins of all users, or only this
84b277
             boot.  Note that in the last case, no systemd daemon
84b277
             configuration is reloaded.</para>
84b277
+
84b277
+            <para>Using <command>enable</command> on masked units
84b277
+            results in an error.</para>
84b277
           </listitem>
84b277
         </varlistentry>
84b277
 
84b277
@@ -999,8 +1002,8 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
84b277
             <filename>/dev/null</filename>, making it impossible to
84b277
             start them. This is a stronger version of
84b277
             <command>disable</command>, since it prohibits all kinds of
84b277
-            activation of the unit, including manual activation. Use
84b277
-            this option with care. This honors the
84b277
+            activation of the unit, including enablement and manual
84b277
+            activation. Use this option with care. This honors the
84b277
             <option>--runtime</option> option, to only mask temporarily
84b277
             until the next reoobt of the system.</para>
84b277
           </listitem>