Merge pull request #2973 from poettering/search-path

Many fixes, in particular to the install logic

13 files changed, 127 insertions, 112 deletions

diff --git a/man/machinectl.xml b/man/machinectl.xml
index cee4bb72ce..a77d2419af 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -133,7 +133,9 @@
 
         <para>When listing VM or container images, do not suppress
         images beginning in a dot character
-        (<literal>.</literal>).</para></listitem>
+        (<literal>.</literal>).</para>
+
+        <para>When cleaning VM or container images, remove all images, not just hidden ones.</para></listitem>
       </varlistentry>
 
        <varlistentry>
@@ -217,9 +219,11 @@
         <term><option>--read-only</option></term>
 
         <listitem><para>When used with <command>bind</command>, applies
-        a read-only bind mount.</para></listitem>
-      </varlistentry>
+        a read-only bind mount.</para>
 
+        <para>When used with <command>clone</command>, <command>import-raw</command> or <command>import-tar</command> a
+        read-only container or VM image is created.</para></listitem>
+      </varlistentry>
 
       <varlistentry>
         <term><option>-n</option></term>
@@ -599,7 +603,10 @@
         all other settings that could identify the instance
         unmodified. The original image and the cloned copy will hence
         share these credentials, and it might be necessary to manually
-        change them in the copy.</para></listitem>
+        change them in the copy.</para>
+
+        <para>If combined with the <option>--read-only</option> switch a read-only cloned image is
+        created.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -660,6 +667,23 @@
         itself.</para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><command>clean</command></term>
+
+        <listitem><para>Remove hidden VM or container images (or all). This command removes all hidden machine images
+        from <filename>/var/lib/machines</filename>, i.e. those whose name begins with a dot. Use <command>machinectl
+        list-images --all</command> to see a list of all machine images, including the hidden ones.</para>
+
+        <para>When combined with the <option>--all</option> switch removes all images, not just hidden ones. This
+        command effectively empties <filename>/var/lib/machines</filename>.</para>
+
+        <para>Note that commands such as <command>machinectl pull-tar</command> or <command>machinectl
+        pull-raw</command> usually create hidden, read-only, unmodified machine images from the downloaded image first,
+        before cloning a writable working copy of it, in order to avoid duplicate downloads in case of images that are
+        reused multiple times. Use <command>machinectl clean</command> to remove old, hidden images created this
+        way.</para></listitem>
+      </varlistentry>
+
     </variablelist></refsect2>
 
     <refsect2><title>Image Transfer Commands</title><variablelist>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 089fb0f5c3..5f624243f7 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -1168,22 +1168,32 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
                   </row>
                   <row>
                     <entry><literal>static</literal></entry>
-                    <entry>The unit file is not enabled, and has no provisions for enabling in the <literal>[Install]</literal> section.</entry>
+                    <entry>The unit file is not enabled, and has no provisions for enabling in the <literal>[Install]</literal> unit file section.</entry>
                     <entry>0</entry>
                   </row>
                   <row>
                     <entry><literal>indirect</literal></entry>
-                    <entry>The unit file itself is not enabled, but it has a non-empty <varname>Also=</varname> setting in the <literal>[Install]</literal> section, listing other unit files that might be enabled.</entry>
+                    <entry>The unit file itself is not enabled, but it has a non-empty <varname>Also=</varname> setting in the <literal>[Install]</literal> unit file section, listing other unit files that might be enabled.</entry>
                     <entry>0</entry>
                   </row>
                   <row>
                     <entry><literal>disabled</literal></entry>
-                    <entry>Unit file is not enabled, but contains an <literal>[Install]</literal> section with installation instructions.</entry>
+                    <entry>The unit file is not enabled, but contains an <literal>[Install]</literal> section with installation instructions.</entry>
                     <entry>&gt; 0</entry>
                   </row>
                   <row>
+                    <entry><literal>generated</literal></entry>
+                    <entry>The unit file was generated dynamically via a generator tool. See <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>. Generated unit files may not be enabled, they are enabled implicitly by their generator.</entry>
+                    <entry>0</entry>
+                  </row>
+                  <row>
+                    <entry><literal>transient</literal></entry>
+                    <entry>The unit file has been created dynamically with the runtime API. Transient units may not be enabled.</entry>
+                    <entry>0</entry>
+                  </row>
+                  <row>
                     <entry><literal>bad</literal></entry>
-                    <entry>Unit file is invalid or another error occurred. Note that <command>is-enabled</command> will not actually return this state, but print an error message instead. However the unit file listing printed by <command>list-unit-files</command> might show it.</entry>
+                    <entry>The unit file is invalid or another error occurred. Note that <command>is-enabled</command> will not actually return this state, but print an error message instead. However the unit file listing printed by <command>list-unit-files</command> might show it.</entry>
                     <entry>&gt; 0</entry>
                   </row>
                 </tbody>
@@ -1235,6 +1245,28 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
         </varlistentry>
 
         <varlistentry>
+          <term><command>revert <replaceable>NAME</replaceable>...</command></term>
+
+          <listitem>
+            <para>Revert one or more unit files to their vendor versions. This command removes drop-in configuration
+            files that modify the specified units, as well as any user-configured unit file that overrides a matching
+            vendor supplied unit file. Specifically, for a unit <literal>foo.service</literal> the matching directories
+            <literal>foo.service.d/</literal> with all their contained files are removed, both below the persistent and
+            runtime configuration directories (i.e. below <filename>/etc/systemd/system</filename> and
+            <filename>/run/systemd/system</filename>); if the unit file has a vendor-supplied version (i.e. a unit file
+            located below <filename>/usr</filename>) any matching peristent or runtime unit file that overrides it is
+            removed, too. Note that if a unit file has no vendor-supplied version (i.e. is only defined below
+            <filename>/etc/systemd/system</filename> or <filename>/run/systemd/system</filename>, but not in a unit
+            file stored below <filename>/usr</filename>), then it is not removed. Also, if a unit is masked, it is
+            unmasked.</para>
+
+            <para>Effectively, this command may be used to undo all changes made with <command>systemctl
+            edit</command>, <command>systemctl set-property</command> and <command>systemctl mask</command> and puts
+            the original unit file with its settings back in effect.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
           <term><command>add-wants <replaceable>TARGET</replaceable>
           <replaceable>NAME</replaceable>...</command></term>
           <term><command>add-requires <replaceable>TARGET</replaceable>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 3f3bd38900..8a004af1a2 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -58,7 +58,7 @@
     </cmdsynopsis>
     <cmdsynopsis>
       <command>systemd-nspawn</command>
-      <arg choice="plain">-b</arg>
+      <arg choice="plain">--boot</arg>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
       <arg choice="opt" rep="repeat">ARGS</arg>
     </cmdsynopsis>
@@ -263,7 +263,7 @@
         signals. It is recommended to use this mode to invoke arbitrary commands in containers, unless they have been
         modified to run correctly as PID 1. Or in other words: this switch should be used for pretty much all commands,
         except when the command refers to an init or shell implementation, as these are generally capable of running
-        correctly as PID 1). This option may not be combined with <option>--boot</option> or
+        correctly as PID 1. This option may not be combined with <option>--boot</option> or
         <option>--share-system</option>.</para>
         </listitem>
       </varlistentry>
@@ -294,12 +294,12 @@
             <tbody>
               <row>
                 <entry>Neither <option>--as-pid2</option> nor <option>--boot</option> specified</entry>
-                <entry>The passed parameters are interpreted as command line, which is executed as PID 1 in the container.</entry>
+                <entry>The passed parameters are interpreted as the command line, which is executed as PID 1 in the container.</entry>
               </row>
 
               <row>
                 <entry><option>--as-pid2</option> specified</entry>
-                <entry>The passed parameters are interpreted as command line, which are executed as PID 2 in the container. A stub init process is run as PID 1.</entry>
+                <entry>The passed parameters are interpreted as the command line, which is executed as PID 2 in the container. A stub init process is run as PID 1.</entry>
               </row>
 
               <row>
diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml
index 1b0ae832da..93bae2a6dc 100644
--- a/man/systemd.automount.xml
+++ b/man/systemd.automount.xml
@@ -97,11 +97,9 @@
     <para>An implicit <varname>Before=</varname> dependency is created
     between an automount unit and the mount unit it activates.</para>
 
-    <para>Automount units acquire automatic <varname>Before=</varname>
-    and <varname>Conflicts=</varname> on
-    <filename>umount.target</filename> in order to be stopped during
-    shutdown, unless <varname>DefaultDependencies=no</varname> is
-    set.</para>
+    <para>Automount units acquire automatic <varname>Before=</varname> and <varname>Conflicts=</varname> on
+    <filename>umount.target</filename> in order to be stopped during shutdown, unless
+    <varname>DefaultDependencies=no</varname> is set in the <literal>[Unit]</literal> section.</para>
 
   </refsect1>
 
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 4a8d265fed..f116782b40 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -128,26 +128,17 @@
     <filename>systemd-quotacheck.service</filename> and
     <filename>quotaon.service</filename> are added.</para>
 
-    <para>For mount units with
-    <varname>DefaultDependencies=yes</varname> (the default) a couple
-    additional dependencies are added. Mount units referring to local
-    file systems automatically gain an <varname>After=</varname>
-    dependency on <filename>local-fs-pre.target</filename>. Network
-    mount units automatically acquire <varname>After=</varname>
-    dependencies on <filename>remote-fs-pre.target</filename>,
-    <filename>network.target</filename> and
-    <filename>network-online.target</filename>. Towards the latter a
-    <varname>Wants=</varname> unit is added as well. Mount units
-    referring to local and network file systems are distinguished by
-    their file system type specification. In some cases this is not
-    sufficient (for example network block device based mounts, such as
-    iSCSI), in which case <option>_netdev</option> may be added to the
-    mount option string of the unit, which forces systemd to consider the
-    mount unit a network mount. Mount units (regardless if local or
-    network) also acquire automatic <varname>Before=</varname> and
-    <varname>Conflicts=</varname> on
-    <filename>umount.target</filename> in order to be stopped
-    during shutdown.</para>
+    <para>For mount units with <varname>DefaultDependencies=yes</varname> in the <literal>[Unit]</literal> section (the
+    default) a couple additional dependencies are added. Mount units referring to local file systems automatically gain
+    an <varname>After=</varname> dependency on <filename>local-fs-pre.target</filename>. Network mount units
+    automatically acquire <varname>After=</varname> dependencies on <filename>remote-fs-pre.target</filename>,
+    <filename>network.target</filename> and <filename>network-online.target</filename>. Towards the latter a
+    <varname>Wants=</varname> unit is added as well. Mount units referring to local and network file systems are
+    distinguished by their file system type specification. In some cases this is not sufficient (for example network
+    block device based mounts, such as iSCSI), in which case <option>_netdev</option> may be added to the mount option
+    string of the unit, which forces systemd to consider the mount unit a network mount. Mount units (regardless if
+    local or network) also acquire automatic <varname>Before=</varname> and <varname>Conflicts=</varname> on
+    <filename>umount.target</filename> in order to be stopped during shutdown.</para>
 
     <para>Additional implicit dependencies may be added as result of
     execution and resource control parameters as documented in
diff --git a/man/systemd.path.xml b/man/systemd.path.xml
index 1bd65ce86d..7200c8fe27 100644
--- a/man/systemd.path.xml
+++ b/man/systemd.path.xml
@@ -91,16 +91,12 @@
     <para>An implicit <varname>Before=</varname> dependency is added
     between a path unit and the unit it is supposed to activate.</para>
 
-    <para>Unless <varname>DefaultDependencies=false</varname> is used,
-    path units will implicitly have dependencies of type
-    <varname>Before=</varname> on <filename>paths.target</filename>,
-    dependencies of type <varname>After=</varname> and
-    <varname>Requires=</varname> on
-    <filename>sysinit.target</filename>, and have dependencies of type
-    <varname>Conflicts=</varname> and <varname>Before=</varname> on
-    <filename>shutdown.target</filename>. These ensure that path units
-    are terminated cleanly prior to system shutdown. Only path units
-    involved with early boot or late system shutdown should disable
+    <para>Unless <varname>DefaultDependencies=false</varname> in the <literal>[Unit]</literal> section is used, path
+    units will implicitly have dependencies of type <varname>Before=</varname> on <filename>paths.target</filename>,
+    dependencies of type <varname>After=</varname> and <varname>Requires=</varname> on
+    <filename>sysinit.target</filename>, and have dependencies of type <varname>Conflicts=</varname> and
+    <varname>Before=</varname> on <filename>shutdown.target</filename>. These ensure that path units are terminated
+    cleanly prior to system shutdown. Only path units involved with early boot or late system shutdown should disable
     this option.
     </para>
   </refsect1>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index e55534700a..6641dfed4f 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -100,18 +100,13 @@
     their activated <filename>.socket</filename> units via an
     automatic <varname>After=</varname> dependency.</para>
 
-    <para>Unless <varname>DefaultDependencies=</varname> is set to
-    <option>false</option>, service units will implicitly have
-    dependencies of type <varname>Requires=</varname> and
-    <varname>After=</varname> on <filename>sysinit.target</filename>,
-    a dependency of type <varname>After=</varname> on
-    <filename>basic.target</filename> as well as dependencies of
-    type <varname>Conflicts=</varname> and <varname>Before=</varname>
-    on <filename>shutdown.target</filename>. These ensure that normal
-    service units pull in basic system initialization, and are
-    terminated cleanly prior to system shutdown. Only services
-    involved with early boot or late system shutdown should disable
-    this option.</para>
+    <para>Unless <varname>DefaultDependencies=</varname> in the <literal>[Unit]</literal> is set to
+    <option>false</option>, service units will implicitly have dependencies of type <varname>Requires=</varname> and
+    <varname>After=</varname> on <filename>sysinit.target</filename>, a dependency of type <varname>After=</varname> on
+    <filename>basic.target</filename> as well as dependencies of type <varname>Conflicts=</varname> and
+    <varname>Before=</varname> on <filename>shutdown.target</filename>. These ensure that normal service units pull in
+    basic system initialization, and are terminated cleanly prior to system shutdown. Only services involved with early
+    boot or late system shutdown should disable this option.</para>
 
     <para>Instanced service units (i.e. service units with an <literal>@</literal> in their name) are assigned by
     default a per-template slice unit (see
diff --git a/man/systemd.slice.xml b/man/systemd.slice.xml
index 5c87bf0260..16247628af 100644
--- a/man/systemd.slice.xml
+++ b/man/systemd.slice.xml
@@ -106,14 +106,10 @@
     <varname>After=</varname> and <varname>Requires=</varname> on
     their immediate parent slice unit.</para>
 
-    <para>Unless <varname>DefaultDependencies=false</varname>
-    is used, slice units will implicitly have dependencies of
-    type <varname>Conflicts=</varname> and
-    <varname>Before=</varname> on
-    <filename>shutdown.target</filename>. These ensure
-    that slice units are removed prior to system
-    shutdown. Only slice units involved with early boot or
-    late system shutdown should disable this option.
+    <para>Unless <varname>DefaultDependencies=false</varname> is used in the <literal>[Unit]</literal> section, slice
+    units will implicitly have dependencies of type <varname>Conflicts=</varname> and <varname>Before=</varname> on
+    <filename>shutdown.target</filename>. These ensure that slice units are removed prior to system shutdown. Only
+    slice units involved with early boot or late system shutdown should disable this option.
     </para>
   </refsect1>
 
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 43841c2399..2d6339680b 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -97,16 +97,12 @@
     <filename>foo@.service</filename> must exist from which services
     are instantiated for each incoming connection.</para>
 
-    <para>Unless <varname>DefaultDependencies=</varname> is set to
-    <option>false</option>, socket units will implicitly have
-    dependencies of type <varname>Requires=</varname> and
-    <varname>After=</varname> on <filename>sysinit.target</filename>
-    as well as dependencies of type <varname>Conflicts=</varname> and
-    <varname>Before=</varname> on
-    <filename>shutdown.target</filename>. These ensure that socket
-    units pull in basic system initialization, and are terminated
-    cleanly prior to system shutdown. Only sockets involved with early
-    boot or late system shutdown should disable this option.</para>
+    <para>Unless <varname>DefaultDependencies=</varname> in the <literal>[Unit]</literal> section is set to
+    <option>false</option>, socket units will implicitly have dependencies of type <varname>Requires=</varname> and
+    <varname>After=</varname> on <filename>sysinit.target</filename> as well as dependencies of type
+    <varname>Conflicts=</varname> and <varname>Before=</varname> on <filename>shutdown.target</filename>. These ensure
+    that socket units pull in basic system initialization, and are terminated cleanly prior to system shutdown. Only
+    sockets involved with early boot or late system shutdown should disable this option.</para>
 
     <para>Socket units will have a <varname>Before=</varname>
     dependency on the service which they trigger added implicitly. No
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 69d4be4769..6fc4c7bf13 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -95,12 +95,10 @@
     dependencies on the device units or the mount units of the files
     they are activated from.</para>
 
-    <para>Swap units with <varname>DefaultDependencies=</varname>
-    enabled implicitly acquire a <varname>Conflicts=</varname> and an
-    <varname>After=</varname> dependency on
-    <filename>umount.target</filename> so that they are deactivated at
-    shutdown, unless <varname>DefaultDependencies=no</varname> is
-    specified.</para>
+    <para>Swap units with <varname>DefaultDependencies=</varname> in the <literal>[Unit]</literal> section enabled
+    implicitly acquire a <varname>Conflicts=</varname> and an <varname>After=</varname> dependency on
+    <filename>umount.target</filename> so that they are deactivated at shutdown, unless
+    <varname>DefaultDependencies=no</varname> is specified.</para>
 
     <para>Additional implicit dependencies may be added as result of
     execution and resource control parameters as documented in
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index bd4ab3903e..ab910d75dd 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -82,14 +82,11 @@
   <refsect1>
     <title>Automatic Dependencies</title>
 
-    <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> 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
-    <varname>DefaultDependencies=no</varname>.</para>
+    <para>Unless <varname>DefaultDependencies=</varname> in the <literal>[Unit]</literal> section is set to
+    <option>no</option>, target units will implicitly complement all configured dependencies of type
+    <varname>Wants=</varname>, <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 <varname>DefaultDependencies=no</varname>.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 29e235e2dc..22c83f790f 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -81,21 +81,15 @@
     <para>Timer units automatically gain a <varname>Before=</varname>
     dependency on the service they are supposed to activate.</para>
 
-    <para>Unless <varname>DefaultDependencies=</varname> is set to
-    <option>false</option>, all timer units will implicitly have
-    dependencies of type <varname>Requires=</varname> and
-    <varname>After=</varname> on <filename>sysinit.target</filename>,
-    a dependency of type <varname>Before=</varname> on
-    <filename>timers.target</filename>, as well as
-    <varname>Conflicts=</varname> and <varname>Before=</varname> on
-    <filename>shutdown.target</filename> to ensure that they are
-    stopped cleanly prior to system shutdown.  Timer units with at
-    least one <varname>OnCalendar=</varname> directive will have an
-    additional <varname>After=</varname> dependency on
-    <filename>timer-sync.target</filename> to avoid being started
-    before the system clock has been correctly set. Only timer units
-    involved with early boot or late system shutdown should disable
-    the <varname>DefaultDependencies=</varname> option.</para>
+    <para>Unless <varname>DefaultDependencies=</varname> in the <literal>[Unit]</literal> section is set to
+    <option>false</option>, all timer units will implicitly have dependencies of type <varname>Requires=</varname> and
+    <varname>After=</varname> on <filename>sysinit.target</filename>, a dependency of type <varname>Before=</varname>
+    on <filename>timers.target</filename>, as well as <varname>Conflicts=</varname> and <varname>Before=</varname> on
+    <filename>shutdown.target</filename> to ensure that they are stopped cleanly prior to system shutdown.  Timer units
+    with at least one <varname>OnCalendar=</varname> directive will have an additional <varname>After=</varname>
+    dependency on <filename>timer-sync.target</filename> to avoid being started before the system clock has been
+    correctly set. Only timer units involved with early boot or late system shutdown should disable the
+    <varname>DefaultDependencies=</varname> option.</para>
   </refsect1>
 
   <refsect1>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index f5022b03cc..7993301167 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -66,18 +66,16 @@
     <para><literallayout><filename>/etc/systemd/system/*</filename>
 <filename>/run/systemd/system/*</filename>
 <filename>/usr/lib/systemd/system/*</filename>
-<filename>...</filename>
+<filename>…</filename>
     </literallayout></para>
 
-    <para><literallayout><filename>$XDG_CONFIG_HOME/systemd/user/*</filename>
-<filename>$HOME/.config/systemd/user/*</filename>
+    <para><literallayout><filename>~/.config/systemd/user/*</filename>
 <filename>/etc/systemd/user/*</filename>
 <filename>$XDG_RUNTIME_DIR/systemd/user/*</filename>
 <filename>/run/systemd/user/*</filename>
-<filename>$XDG_DATA_HOME/systemd/user/*</filename>
-<filename>$HOME/.local/share/systemd/user/*</filename>
+<filename>~/.local/share/systemd/user/*</filename>
 <filename>/usr/lib/systemd/user/*</filename>
-<filename>...</filename>
+<filename>…</filename>
     </literallayout></para>
   </refsynopsisdiv>