Merge pull request #31364 from bluca/vpick_ext

core: add support for vpick for ExtensionImages=/ExtensionDirectories=

5 files changed, 27 insertions, 16 deletions

diff --git a/man/systemd-dissect.xml b/man/systemd-dissect.xml
index e72c66386a..b65a2c39f1 100644
--- a/man/systemd-dissect.xml
+++ b/man/systemd-dissect.xml
@@ -124,9 +124,7 @@
     project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>. For
     details see below.</para>
 
-    <para>In place of the image path a <literal>.v/</literal> versioned directory may be specified, see
-    <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
-    details.</para>
+    <xi:include href="vpick.xml" xpointer="image"/>
   </refsect1>
 
   <refsect1>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index f39f1a8ca6..29edbba4cc 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -217,9 +217,7 @@
         <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         section "Files and Directories" for the precise search path.</para>
 
-        <para>In place of the directory path a <literal>.v/</literal> versioned directory may be specified, see
-        <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
-        details.</para>
+        <xi:include href="vpick.xml" xpointer="directory"/>
 
         <para>If neither <option>--directory=</option>, <option>--image=</option>, nor
         <option>--machine=</option> are specified, the current directory will be used. May not be specified
@@ -317,9 +315,7 @@
         <para>Any other partitions, such as foreign partitions or swap partitions are not mounted. May not be specified
         together with <option>--directory=</option>, <option>--template=</option>.</para>
 
-        <para>In place of the image path a <literal>.v/</literal> versioned directory may be specified, see
-        <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
-        details.</para>
+        <xi:include href="vpick.xml" xpointer="image"/>
 
         <xi:include href="version-info.xml" xpointer="v211"/></listitem>
       </varlistentry>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index dac19d6537..05f5f20f44 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -155,9 +155,7 @@
           <programlisting>BindReadOnlyPaths=/dev/log /run/systemd/journal/socket /run/systemd/journal/stdout</programlisting>
         </example>
 
-        <para>In place of the directory path a <literal>.v/</literal> versioned directory may be specified,
-        see <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
-        details.</para>
+        <xi:include href="vpick.xml" xpointer="directory"/>
 
         <xi:include href="system-or-user-ns.xml" xpointer="singular"/></listitem>
       </varlistentry>
@@ -195,9 +193,7 @@
         <citerefentry><refentrytitle>systemd-soft-reboot.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>),
         in case the service is configured to survive it.</para>
 
-        <para>In place of the image path a <literal>.v/</literal> versioned directory may be specified, see
-        <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
-        details.</para>
+        <xi:include href="vpick.xml" xpointer="image"/>
 
         <xi:include href="system-only.xml" xpointer="singular"/>
 
@@ -555,6 +551,8 @@
         <varname>PrivateDevices=</varname> below, as it may change the setting of
         <varname>DevicePolicy=</varname>.</para>
 
+        <xi:include href="vpick.xml" xpointer="image"/>
+
         <xi:include href="system-only.xml" xpointer="singular"/>
 
         <xi:include href="version-info.xml" xpointer="v248"/></listitem>
@@ -590,6 +588,8 @@
         <para>Note that usage from user units requires overlayfs support in unprivileged user namespaces,
         which was first introduced in kernel v5.11.</para>
 
+        <xi:include href="vpick.xml" xpointer="directory"/>
+
         <xi:include href="system-or-user-ns.xml" xpointer="singular"/>
 
         <xi:include href="version-info.xml" xpointer="v251"/></listitem>
diff --git a/man/systemd.v.xml b/man/systemd.v.xml
index b29d32f69a..43e77bdba2 100644
--- a/man/systemd.v.xml
+++ b/man/systemd.v.xml
@@ -26,7 +26,7 @@
     <para>In various places systemd components accept paths whose trailing components have the
     <literal>.v/</literal> suffix, pointing to a directory. These components will then automatically look for
     suitable files inside the directory, do a version comparison and open the newest file found (by
-    version). Specifically, two expressions are supported:</para>
+    version). Available since version v256. Specifically, two expressions are supported:</para>
 
     <itemizedlist>
 
diff --git a/man/vpick.xml b/man/vpick.xml
new file mode 100644
index 0000000000..e212895947
--- /dev/null
+++ b/man/vpick.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE refsect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<!--
+  SPDX-License-Identifier: LGPL-2.1-or-later
+-->
+
+<refsect1>
+  <title/>
+    <para id="image">In place of the image path a <literal>.v/</literal> versioned directory may be specified, see
+    <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
+    details.</para>
+
+    <para id="directory">In place of the directory path a <literal>.v/</literal> versioned directory may be specified,
+    see <citerefentry><refentrytitle>systemd.v</refentrytitle><manvolnum>7</manvolnum></citerefentry> for
+    details.</para>
+</refsect1>