From f32b43bda454a70ae23d6802605d41b26dc24ce2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 12 Nov 2015 19:21:47 +0100
Subject: core: remove support for RequiresOverridable= and
 RequisiteOverridable=

As discussed at systemd.conf 2015 and on also raised on the ML:

http://lists.freedesktop.org/archives/systemd-devel/2015-November/034880.html

This removes the two XyzOverridable= unit dependencies, that were
basically never used, and do not enhance user experience in any way.
Most folks looking for the functionality this provides probably opt for
the "ignore-dependencies" job mode, and that's probably a good idea.

Hence, let's simplify systemd's dependency engine and remove these two
dependency types (and their inverses).

The unit file parser and the dbus property parser will now redirect
the settings/properties to result in an equivalent non-overridable
dependency. In the case of the unit file parser we generate a warning,
to inform the user.

The dbus properties for this unit type stay available on the unit
objects, but they are now hidden from usual introspection and will
always return the empty list when queried.

This should provide enough compatibility for the few unit files that
actually ever made use of this.
---
 man/systemctl.xml       |  3 ---
 man/systemd-analyze.xml |  2 --
 man/systemd.target.xml  |  3 +--
 man/systemd.unit.xml    | 20 +-------------------
 4 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'man')

diff --git a/man/systemctl.xml b/man/systemctl.xml
index 173c463d12..0e4eba9781 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -179,7 +179,6 @@
           <command>list-dependencies</command>, i.e. follow
           dependencies of type <varname>WantedBy=</varname>,
           <varname>RequiredBy=</varname>,
-          <varname>RequiredByOverridable=</varname>,
           <varname>PartOf=</varname>, <varname>BoundBy=</varname>,
           instead of <varname>Wants=</varname> and similar.
           </para>
@@ -932,9 +931,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             <para>Shows units required and wanted by the specified
             unit. This recursively lists units following the
             <varname>Requires=</varname>,
-            <varname>RequiresOverridable=</varname>,
             <varname>Requisite=</varname>,
-            <varname>RequisiteOverridable=</varname>,
             <varname>ConsistsOf=</varname>,
             <varname>Wants=</varname>, <varname>BindsTo=</varname>
             dependencies. If no unit is specified,
diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml
index f55c6fb7f3..bc37765dff 100644
--- a/man/systemd-analyze.xml
+++ b/man/systemd-analyze.xml
@@ -226,9 +226,7 @@
         <varname>After=</varname> or <varname>Before=</varname> are
         shown. If <option>--require</option> is passed, only
         dependencies of type <varname>Requires=</varname>,
-        <varname>RequiresOverridable=</varname>,
         <varname>Requisite=</varname>,
-        <varname>RequisiteOverridable=</varname>,
         <varname>Wants=</varname> and <varname>Conflicts=</varname>
         are shown. If neither is passed, this shows dependencies of
         all these types.</para></listitem>
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index 54a5f5035c..bd4ab3903e 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -85,8 +85,7 @@
     <para>Unless <varname>DefaultDependencies=</varname> is set to
     <option>no</option>, target units will implicitly complement all
     configured dependencies of type <varname>Wants=</varname>,
-    <varname>Requires=</varname>,
-    <varname>RequiresOverridable=</varname> with dependencies of type
+    <varname>Requires=</varname> with dependencies of type
     <varname>After=</varname>, unless an ordering dependency of any
     kind between the target and the respective other unit is already
     in place. Note that this behaviour is disabled if either unit has
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index b4044f43ef..c61469b2e7 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -451,28 +451,10 @@
         above.</para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><varname>RequiresOverridable=</varname></term>
-
-        <listitem><para>Similar to <varname>Requires=</varname>.
-        Dependencies listed in <varname>RequiresOverridable=</varname>
-        which cannot be fulfilled or fail to start are ignored if the
-        startup was explicitly requested by the user. If the start-up
-        was pulled in indirectly by some dependency or automatic
-        start-up of units that is not requested by the user, this
-        dependency must be fulfilled and otherwise the transaction
-        fails. Hence, this option may be used to configure
-        dependencies that are normally honored unless the user
-        explicitly starts up the unit, in which case whether they
-        failed or not is irrelevant.</para></listitem>
-
-      </varlistentry>
       <varlistentry>
         <term><varname>Requisite=</varname></term>
-        <term><varname>RequisiteOverridable=</varname></term>
 
-        <listitem><para>Similar to <varname>Requires=</varname> and
-        <varname>RequiresOverridable=</varname>, respectively.
+        <listitem><para>Similar to <varname>Requires=</varname>.
         However, if the units listed here are not started already,
         they will not be started and the transaction will fail
         immediately. </para></listitem>
-- 
cgit v1.2.3-54-g00ecf