Merge 413f6e0f56 into 321c202e7c

Closes #35307.

man/environment.d.xml

@@ -114,10 +114,10 @@
     invoked, for example from the system service manager or via a PAM module.</para>
 
     <para>Specifically, for ssh logins, the
-    <citerefentry project='die-net'><refentrytitle>sshd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    <citerefentry project='man-pages'><refentrytitle>sshd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     service builds an environment that is a combination of variables forwarded from the remote system and
     defined by <command>sshd</command>, see the discussion in
-    <citerefentry project='die-net'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+    <citerefentry project='man-pages'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
     A graphical display session will have an analogous mechanism to define the environment. Note that some
     managers query the systemd user instance for the exported environment and inject this configuration into
     programs they start, using <command>systemctl show-environment</command> or the underlying D-Bus call.

man/file-hierarchy.xml

@@ -215,8 +215,8 @@
         below this directory is subject to specifications that ensure interoperability.</para>
 
         <para>Note that resources placed in this directory typically are under shared ownership,
-        i.e. multiple different packages have provide and consume these resources, on equal footing, without
-        any obvious primary owner. This makes makes things systematically different from
+        i.e. multiple different packages have provided and consumed these resources, on equal footing, without
+        any obvious primary owner. This makes things systematically different from
         <filename>/usr/lib/</filename>, where ownership is generally not shared.</para></listitem>
       </varlistentry>
 

man/homectl.xml

@@ -378,7 +378,7 @@
 
         <listitem><para>Takes a comma- or colon-separated list of languages preferred by the user, ordered
         by descending priority. The <varname>$LANG</varname> and <varname>$LANGUAGE</varname> environment
-        variables are initialized from this value on login, and thus values suitible for these environment
+        variables are initialized from this value on login, and thus values suitable for these environment
         variables are accepted here, for example <option>--language=de_DE.UTF-8</option>. This option may
         be used more than once, in which case the language lists are concatenated.</para>
 

man/importctl.xml

@@ -40,7 +40,7 @@
     <citerefentry><refentrytitle>systemd-importd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
 
     <para><command>importctl</command> operates both on block-level disk images (such as DDIs) as well as
-    file-system-level images (tarballs). It supports disk images are one of the four following
+    file-system-level images (tarballs). It supports disk images in one of the four following
     classes:</para>
 
     <itemizedlist>
@@ -50,7 +50,7 @@
       managed via
       <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para></listitem>
 
-      <listitem><para>Portable service images, that may be attached an managed via
+      <listitem><para>Portable service images, that may be attached and managed via
       <citerefentry><refentrytitle>portablectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para></listitem>
 
       <listitem><para>System extension (sysext) images, that may be activated via
@@ -133,7 +133,7 @@
         multiple downloads are not necessary. In order to create only the read-only image, and avoid creating
         its writable snapshot, specify <literal>-</literal> as local name.</para>
 
-        <para>Note that pressing C-c during execution of this command will not abort the download. Use
+        <para>Note that pressing Control-c during execution of this command will not abort the download. Use
         <command>cancel-transfer</command>, described below.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
@@ -145,14 +145,14 @@
         <listitem><para>Downloads a <filename>.raw</filename> disk image from the specified URL, and makes it
         available under the specified local name in the image directory for the selected
         <option>--class=</option>. The URL must be of type <literal>http://</literal> or
-        <literal>https://</literal>. The image must either be a <filename>.qcow2</filename> or raw disk
+        <literal>https://</literal>. The image must either be a qcow2 or raw disk
         image, optionally compressed as <filename>.gz</filename>, <filename>.xz</filename>, or
         <filename>.bz2</filename>. If the local name is omitted, it is automatically derived from the last
         component of the URL, with its suffix removed.</para>
 
         <para>Image verification is identical for raw and tar images (see above).</para>
 
-        <para>If the downloaded image is in <filename>.qcow2</filename> format it is converted into a raw
+        <para>If the downloaded image is in qcow2 format it is converted into a raw
         image file before it is made available.</para>
 
         <para>If <option>-keep-download=yes</option> is specified the image will be downloaded and stored in
@@ -162,7 +162,7 @@
         necessary. In order to create only the read-only image, and avoid creating its writable copy,
         specify <literal>-</literal> as local name.</para>
 
-        <para>Note that pressing C-c during execution of this command will not abort the download. Use
+        <para>Note that pressing Control-c during execution of this command will not abort the download. Use
         <command>cancel-transfer</command>, described below.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
@@ -174,8 +174,14 @@
 
         <listitem><para>Imports a TAR or RAW image, and places it under the specified name in the image
         directory for the image class selected via <option>--class=</option>. When
-        <command>import-tar</command> is used, the file specified as the first argument should be a tar
-        archive, possibly compressed with xz, gzip or bzip2. It will then be unpacked into its own
+        <command>import-tar</command> is used, the file specified as the first argument should be a
+        <citerefentry project='die-net'><refentrytitle>tar</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+        archive, possibly compressed with
+        <citerefentry project='die-net'><refentrytitle>xz</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry project='die-net'><refentrytitle>gzip</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        or
+        <citerefentry project='die-net'><refentrytitle>bzip2</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+        It will then be unpacked into its own
         subvolume/directory. When <command>import-raw</command> is used, the file should be a qcow2 or raw
         disk image, possibly compressed with xz, gzip or bzip2. If the second argument (the resulting image
         name) is not specified, it is automatically derived from the file name. If the filename is passed as
@@ -196,7 +202,9 @@
         <listitem><para>Imports an image stored in a local directory into the image directory for the image
         class selected via <option>--class=</option> and operates similarly to <command>import-tar</command>
         or <command>import-raw</command>, but the first argument is the source directory. If supported, this
-        command will create a btrfs snapshot or subvolume for the new image.</para>
+        command will create a
+        <citerefentry project="url"><refentrytitle url="https://btrfs.readthedocs.io/en/latest/btrfs.html">btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        snapshot or subvolume for the new image.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>
@@ -207,9 +215,13 @@
 
         <listitem><para>Exports a TAR or RAW image and stores it in the specified file. The first parameter
         should be an image name. The second parameter should be a file path the TAR or RAW
-        image is written to. If the path ends in <literal>.gz</literal>, the file is compressed with gzip, if
-        it ends in <literal>.xz</literal>, with xz, and if it ends in <literal>.bz2</literal>, with bzip2. If
-        the path ends in neither, the file is left uncompressed. If the second argument is missing, the image
+        image is written to. If the path ends in <literal>.gz</literal>, the file is compressed with
+        <citerefentry project='die-net'><refentrytitle>gzip</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        if it ends in <literal>.xz</literal>, with
+        <citerefentry project='die-net'><refentrytitle>xz</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        and if it ends in <literal>.bz2</literal>, with
+        <citerefentry project='die-net'><refentrytitle>bzip2</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+        If the path ends in neither, the file is left uncompressed. If the second argument is missing, the image
         is written to standard output. The compression may also be explicitly selected with the
         <option>--format=</option> switch. This is in particular useful if the second parameter is left
         unspecified.</para>

man/pam_systemd.xml

@@ -113,11 +113,11 @@
               </row>
               <row>
                 <entry><constant>user-early</constant></entry>
-                <entry>Similar to <literal>user</literal> but sessions of this class are not ordered after <filename>systemd-user-sessions.service</filename>, i.e. may be started before regular sessions are allowed to be established. This session class is the default for sessions of the root user that would otherwise qualify for the <constant>user</constant> class, see above. (Added in v256.)</entry>
+                <entry>Similar to <literal>user</literal> but sessions of this class are not ordered after <citerefentry><refentrytitle>systemd-user-sessions.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, i.e. may be started before regular sessions are allowed to be established. This session class is the default for sessions of the root user that would otherwise qualify for the <constant>user</constant> class, see above. (Added in v256.)</entry>
               </row>
               <row>
                 <entry><constant>user-incomplete</constant></entry>
-                <entry>Similar to <literal>user</literal> but for sessions which are not fully set up yet, i.e. have no home directory mounted or similar. This is used by <citerefentry><refentrytitle>systemd-homed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> to allow users to log in via <command>ssh</command> before their home directory is mounted, delaying the mount until the user provided the unlock password. Sessions of this class are upgraded to the regular <constant>user</constant> class once the home directory is activated.</entry>
+                <entry>Similar to <literal>user</literal> but for sessions which are not fully set up yet, i.e. have no home directory mounted or similar. This is used by <citerefentry><refentrytitle>systemd-homed.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> to allow users to log in via <citerefentry project='man-pages'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry> before their home directory is mounted, delaying the mount until the user provided the unlock password. Sessions of this class are upgraded to the regular <constant>user</constant> class once the home directory is activated.</entry>
               </row>
               <row>
                 <entry><constant>greeter</constant></entry>
@@ -129,15 +129,15 @@
               </row>
               <row>
                 <entry><constant>background</constant></entry>
-                <entry>Used for background sessions, such as those invoked by <command>cron</command> and similar tools. This is the default class for sessions for which no TTY or X display is known at session registration time.</entry>
+                <entry>Used for background sessions, such as those invoked by <citerefentry project='die-net'><refentrytitle>cron</refentrytitle><manvolnum>8</manvolnum></citerefentry> and similar tools. This is the default class for sessions for which no TTY or X display is known at session registration time.</entry>
               </row>
               <row>
                 <entry><constant>background-light</constant></entry>
-                <entry>Similar to <constant>background</constant>, but sessions of this class will not pull in the <filename>user@.service</filename> of the user, and thus possibly have no services of the user running. (Added in v256.)</entry>
+                <entry>Similar to <constant>background</constant>, but sessions of this class will not pull in the <citerefentry><refentrytitle>user@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> of the user, and thus possibly have no services of the user running. (Added in v256.)</entry>
               </row>
               <row>
                 <entry><constant>manager</constant></entry>
-                <entry>The <filename>user@.service</filename> service of the user is registered under this session class. (Added in v256.)</entry>
+                <entry>The <citerefentry><refentrytitle>user@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> service of the user is registered under this session class. (Added in v256.)</entry>
               </row>
               <row>
                 <entry><constant>manager-early</constant></entry>
@@ -445,6 +445,8 @@ session   required   pam_unix.so</programlisting>
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-user-sessions.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>user@.service</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>loginctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>

man/pam_systemd_loadkey.xml

@@ -112,7 +112,8 @@
     during boot.</para>
 
     <para>You need to set the password of your Gnome Keyring/KWallet to the same as your LUKS passphrase.
-    Then add the following lines to your display manager's PAM config under <filename>/etc/pam.d/</filename> (e.g. <filename>sddm-autologin</filename>):</para>
+    Then add the following lines to your display manager's PAM config under <filename>/etc/pam.d/</filename> (e.g.
+    <filename>sddm-autologin</filename>):</para>
 
     <programlisting>
 -auth       optional    pam_systemd_loadkey.so
@@ -131,8 +132,9 @@ KeyringMode=inherit
     <para>In this setup, early during the boot process,
     <citerefentry><refentrytitle>systemd-cryptsetup@.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     will ask for the passphrase and store it in the kernel keyring with the keyname <literal>cryptsetup</literal>.
-    Then when the display manager does the autologin, pam_systemd_loadkey will read the passphrase from the kernel keyring,
-    set it as the PAM authtok, and then pam_gnome_keyring and pam_kwallet5 will unlock with the same passphrase.</para>
+    Then when the display manager does the autologin, <command>pam_systemd_loadkey</command> will read the passphrase
+    from the kernel keyring, set it as the PAM authtok, and then <command>pam_gnome_keyring</command> and
+    <command>pam_kwallet5</command> will unlock with the same passphrase.</para>
   </refsect1>
 
 </refentry>

man/portablectl.xml

@@ -48,7 +48,7 @@
     and transfer them as a whole between systems. When these images are attached to the local system, the contained units
     may run in most ways like regular system-provided units, either with full privileges or inside strict sandboxing,
     depending on the selected configuration. For more details, see
-    <ulink url="https://systemd.io/PORTABLE_SERVICES">Portable Services Documentation</ulink>.</para>
+    <ulink url="https://systemd.io/PORTABLE_SERVICES">Portable Services</ulink>.</para>
 
     <para>Portable service images may be of the following kinds:</para>
 
@@ -417,7 +417,7 @@
         <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
         Images can be block images, btrfs subvolumes or directories. For more information on portable
         services with extensions, see the <literal>Extension Images</literal> paragraph on
-        <ulink url="https://systemd.io/PORTABLE_SERVICES">Portable Services Documentation</ulink>.
+        <ulink url="https://systemd.io/PORTABLE_SERVICES">Portable Services</ulink>.
         </para>
 
         <para>Note that the same extensions have to be specified, in the same order, when attaching

man/repart.d.xml

@@ -606,7 +606,8 @@
         <varname>Subvolumes=</varname>.</para>
 
         <para>Note that this option only takes effect if the target filesystem supports subvolumes, such as
-        <literal>btrfs</literal>.</para>
+        <citerefentry project="url"><refentrytitle url="https://btrfs.readthedocs.io/en/latest/btrfs.html">btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+        </para>
 
         <para>Note that this option is only supported in combination with <option>--offline=yes</option>
         since btrfs-progs 6.11 or newer.</para>
@@ -686,7 +687,7 @@
 
         <listitem><para>Configures the data block size of the generated verity hash partition. Must be between 512 and
         4096 bytes and must be a power of 2. Defaults to the sector size if configured explicitly, or the underlying
-        block device sector size, or 4K if systemd-repart is not operating on a block device.
+        block device sector size, or 4K if <command>systemd-repart</command> is not operating on a block device.
         </para>
 
         <xi:include href="version-info.xml" xpointer="v255"/></listitem>
@@ -697,7 +698,7 @@
 
         <listitem><para>Configures the hash block size of the generated verity hash partition. Must be between 512 and
         4096 bytes and must be a power of 2. Defaults to the sector size if configured explicitly, or the underlying
-        block device sector size, or 4K if systemd-repart is not operating on a block device.
+        block device sector size, or 4K if <command>systemd-repart</command> is not operating on a block device.
         </para>
 
         <xi:include href="version-info.xml" xpointer="v255"/></listitem>
@@ -807,7 +808,9 @@
         mount options. These fields correspond to the second and fourth column of the
         <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         format. This setting may be specified multiple times to mount the partition multiple times. This can
-        be used to add mounts for different btrfs subvolumes located on the same btrfs partition.</para>
+        be used to add mounts for different
+        <citerefentry project="url"><refentrytitle url="https://btrfs.readthedocs.io/en/latest/btrfs.html">btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+        subvolumes located on the same btrfs partition.</para>
 
         <para>Note that this setting is only taken into account when <option>--generate-fstab=</option> is
         specified on the <command>systemd-repart</command> command line.</para>
@@ -818,7 +821,7 @@
       <varlistentry>
         <term><varname>EncryptedVolume=</varname></term>
 
-        <listitem><para>Specify how the encrypted partition should be set up. Takes at least one and at most
+        <listitem><para>Specifies how the encrypted partition should be set up. Takes at least one and at most
         three fields separated with a colon (<literal>:</literal>). The first field specifies the encrypted
         volume name under <filename>/dev/mapper/</filename>. If not specified, <literal>luks-UUID</literal>
         will be used where <literal>UUID</literal> is the LUKS UUID. The second field specifies the keyfile
@@ -837,13 +840,14 @@
       <varlistentry>
         <term><varname>Compression=</varname></term>
 
-        <listitem><para>Specify the compression algorithm to use for the filesystem configured with
+        <listitem><para>Specifies the compression algorithm to use for the filesystem configured with
         <varname>Format=</varname>. Takes a single argument specifying the compression algorithm.</para>
 
         <para>Note that this setting is only taken into account when the filesystem configured with
-        <varname>Format=</varname> supports compression (btrfs, squashfs, erofs). Here's an incomplete list
-        of compression algorithms supported by the filesystems known to
-        <command>systemd-repart</command>:</para>
+        <varname>Format=</varname> supports compression (
+        <citerefentry project="url"><refentrytitle url="https://btrfs.readthedocs.io/en/latest/btrfs.html">btrfs</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        squashfs, erofs). Here's an incomplete list of compression algorithms supported by the filesystems
+        known to <command>systemd-repart</command>:</para>
 
         <table>
           <title>File System Compression Algorithms</title>
@@ -883,7 +887,7 @@
       <varlistentry>
         <term><varname>CompressionLevel=</varname></term>
 
-        <listitem><para>Specify the compression level to use for the filesystem configured with
+        <listitem><para>Specifies the compression level to use for the filesystem configured with
         <varname>Format=</varname>. Takes a single argument specifying the compression level to use for the
         configured compression algorithm. The possible compression levels and their meaning are filesystem
         specific (refer to the filesystem's documentation for the exact meaning of a particular compression

man/resolvectl.xml

@@ -485,7 +485,7 @@
 
         <listitem><para>Takes a boolean parameter; used in conjunction with <command>query</command>. If
         true, rules regarding routing of single-label names are relaxed. Defaults to false. By default,
-        lookups of single label names are assumed to refer to local hosts to be resolved via local resolution
+        lookups of single-label names are assumed to refer to local hosts to be resolved via local resolution
         such as LLMNR or via search domain qualification and are not routed to upstream servers as is. If
         this option is enabled these rules are disabled and the queries are routed upstream anyway. Also see
         the <varname>ResolveUnicastSingleLabel=</varname> option in

man/run0.xml

@@ -81,7 +81,7 @@
       <varlistentry>
         <term><option>--property=</option></term>
 
-        <listitem><para>Sets a property on the service unit that is created. This option takes an assignment
+        <listitem><para>Sets a property of the service unit that is created. This option takes an assignment
         in the same format as
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>'s
         <command>set-property</command> command.</para>
@@ -225,7 +225,7 @@
         <term><option>--machine=</option></term>
 
         <listitem>
-          <para>Execute operation on a local container. Specify a container name to connect to.</para>
+          <para>Execute operation in a local container. Specify a container name to connect to.</para>
 
           <xi:include href="version-info.xml" xpointer="v256"/>
         </listitem>

man/systemctl.xml

@@ -1397,7 +1397,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
             <para>Note that this shows the <emphasis>effective</emphasis> block, i.e. the combination of
             environment variables configured via configuration files, environment generators and via IPC
             (i.e. via the <command>set-environment</command> described below). At the moment a unit process
-            is forked off this combined environment block will be further combined with per-unit environment
+            is forked off, this combined environment block will be further combined with per-unit environment
             variables, which are not visible in this command.</para>
           </listitem>
         </varlistentry>

man/systemd-boot.xml

@@ -54,7 +54,7 @@
 
       <listitem><para>The EFI Shell binary, if installed.</para></listitem>
 
-      <listitem><para>A <literal>Reboot Into Firmware Interface option</literal>, if supported by the UEFI
+      <listitem><para>A <literal>Reboot Into Firmware Interface</literal> option, if supported by the UEFI
       firmware.</para></listitem>
 
       <listitem><para>Secure Boot variables enrollment if the UEFI firmware is in setup-mode and files are provided

man/systemd-cryptenroll.xml

@@ -299,7 +299,7 @@
       <varlistentry>
         <term><option>--unlock-tpm2-device=<replaceable>PATH</replaceable></option></term>
 
-        <listitem><para>Use a TPM2 device instead of a password/passhprase read from stdin to unlock the
+        <listitem><para>Use a TPM2 device instead of a password/passphrase read from stdin to unlock the
         volume. Expects a device node path referring to the TPM2 chip (e.g. <filename>/dev/tpmrm0</filename>).
         Alternatively the special value <literal>auto</literal> may be specified, in order to automatically
         determine the device node of a currently discovered TPM2 device (of which there must be exactly one).

man/systemd-cryptsetup.xml

@@ -32,7 +32,7 @@
       <arg choice="plain">VOLUME</arg>
       <arg choice="plain">SOURCE-DEVICE</arg>
       <arg choice="opt">KEY-FILE</arg>
-      <arg choice="opt">CONFIG</arg>
+      <arg choice="opt">CRYPTTAB-OPTIONS</arg>
     </cmdsynopsis>
 
     <cmdsynopsis>
@@ -150,7 +150,7 @@
       <varlistentry>
         <term><varname>cryptsetup.luks2-pin</varname></term>
 
-        <listitem><para>This credential specifies the PIN requested by generic LUKS2 token modules.</para>
+        <listitem><para>This credential specifies the pin requested by generic LUKS2 token modules.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>

man/systemd-fsck@.service.xml

@@ -57,7 +57,9 @@
     last check, number of mounts, unclean unmount, etc.</para>
 
     <para><filename>systemd-fsck-root.service</filename> and <filename>systemd-fsck-usr.service</filename>
-    will activate <filename>reboot.target</filename> if <command>fsck</command> returns the "System
+    will activate <filename>reboot.target</filename> if
+    <citerefentry project='man-pages'><refentrytitle>fsck</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    returns the "System
     should reboot" condition, or <filename>emergency.target</filename> if <command>fsck</command>
     returns the "Filesystem errors left uncorrected" condition.</para>
 

man/systemd-journald.service.xml

@@ -164,9 +164,10 @@ systemd-tmpfiles --create --prefix /var/log/journal</programlisting>
     used to view the log stream of a specific namespace. If the switch is not used the log stream of the
     default namespace is shown, i.e. log data from other namespaces is not visible.</para>
 
-    <para>Services associated with a specific log namespace may log via syslog, the native logging protocol
-    of the journal and via stdout/stderr; the logging from all three transports is associated with the
-    namespace.</para>
+    <para>Services associated with a specific log namespace may log via
+    <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+    the native logging protocol of the journal and via stdout/stderr; the logging from all three transports
+    is associated with the namespace.</para>
 
     <para>By default only the default namespace will collect kernel and audit log messages.</para>
 
@@ -288,8 +289,11 @@ systemd-tmpfiles --create --prefix /var/log/journal</programlisting>
         <term><varname>systemd.journald.max_level_socket=</varname></term>
 
         <listitem><para>Controls the maximum log level of messages that are stored in the journal, forwarded
-        to syslog, kmsg, the console, the wall, or a socket. This kernel command line options override the
-        settings of the same names in the
+        to
+        <citerefentry project='man-pages'><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+        kmsg, the console,
+        <citerefentry project='man-pages'><refentrytitle>wall</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        or a socket. This kernel command line options override the settings of the same names in the
         <citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         file.</para>
 

man/systemd-machined.service.xml

@@ -136,6 +136,7 @@
       <member><citerefentry><refentrytitle>nss-mymachines</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>org.freedesktop.machine1</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
+      <member><citerefentry project='man-pages'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
     </simplelist></para>
   </refsect1>
 

man/systemd-mountfsd.service.xml

@@ -57,7 +57,9 @@
     <para>The returned mounts are automatically allowlisted in the per-user-namespace allowlist maintained by
     <citerefentry><refentrytitle>systemd-nsresourced.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
 
-    <para>The file systems are automatically fsck'ed before mounting.</para>
+    <para>The file systems are automatically
+    <citerefentry project='man-pages'><refentrytitle>fsck</refentrytitle><manvolnum>8</manvolnum></citerefentry>'ed
+    before mounting.</para>
   </refsect1>
 
   <refsect1>

man/systemd-nspawn.xml

@@ -140,7 +140,7 @@
     <para>When running in unprivileged mode, some needed functionality is provided via
     <citerefentry><refentrytitle>systemd-mountfsd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     and
-    <citerefentry><refentrytitle>systemd-nsresourced.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></para>
+    <citerefentry><refentrytitle>systemd-nsresourced.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
   </refsect1>
 
   <refsect1>

man/systemd-pcrlock.xml

@@ -106,7 +106,7 @@
 
         <listitem><para>This reads the combined TPM2 event log and writes it to STDOUT in <ulink
         url="https://trustedcomputinggroup.org/resource/canonical-event-log-format/">TCG Canonical Event Log
-        Format (CEL-JSON)</ulink> format.</para>
+        Format (CEL-JSON)</ulink>.</para>
 
         <xi:include href="version-info.xml" xpointer="v255"/></listitem>
       </varlistentry>
@@ -387,8 +387,10 @@
 
         <listitem><para>Generates/removes a <filename>.pcrlock</filename> file based on a kernel initrd cpio
         archive. This is useful for predicting measurements the Linux kernel makes to PCR 9
-        ("kernel-initrd"). Do not use for <command>systemd-stub</command> UKIs, as the initrd is combined
-        dynamically from various sources and hence does not take a single input, like this command.</para>
+        ("kernel-initrd"). Do not use for
+        <citerefentry><refentrytitle>systemd-stub</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+        UKIs, as the initrd is combined dynamically from various sources and hence does not take a single
+        input, like this command.</para>
 
         <para>This writes/removes the file
         <filename>/var/lib/pcrlock.d/720-kernel-initrd.pcrlock/generated.pcrlock</filename>.</para>
@@ -521,7 +523,7 @@
       <varlistentry>
         <term><option>--pcrlock=</option></term>
 
-        <listitem><para>Takes a file system path as argument. If specified overrides where to write the
+        <listitem><para>Takes a file system path as argument. If specified, configures where to write the
         generated pcrlock data to. Honoured by the various <command>lock-*</command> commands. If not
         specified, a default path is generally used, as documented above.</para>
 
@@ -531,7 +533,7 @@
       <varlistentry>
         <term><option>--policy=</option></term>
 
-        <listitem><para>Takes a file system path as argument. If specified overrides where to write pcrlock
+        <listitem><para>Takes a file system path as argument. If specified, configures where to write pcrlock
         policy metadata to. If not specified defaults to
         <filename>/var/lib/systemd/pcrlock.json</filename>.</para>
 

man/systemd-poweroff.service.xml

@@ -53,7 +53,7 @@
     might be broken — the running PID 1 could still depend on libraries which are not available any more,
     thus keeping the file system busy, which then cannot be re-mounted read-only.</para>
 
-    <para>Shortly before executing the actual system power-off/halt/reboot/kexec
+    <para>Shortly before executing the actual system power-off/halt/reboot/kexec,
     <filename>systemd-shutdown</filename> will run all executables in
     <filename>/usr/lib/systemd/system-shutdown/</filename> and pass one arguments to them: either
     <literal>poweroff</literal>, <literal>halt</literal>, <literal>reboot</literal>, or

man/systemd-repart.xml

@@ -569,7 +569,7 @@
         (sysext, see
         <citerefentry><refentrytitle>systemd-sysext</refentrytitle><manvolnum>8</manvolnum></citerefentry>
         for details), configuration extension (confext) or <ulink
-        url="https://systemd.io/PORTABLE_SERVICES">portable service</ulink>. The generated image will consist
+        url="https://systemd.io/PORTABLE_SERVICES">Portable Services</ulink>. The generated image will consist
         of a signed Verity <literal>erofs</literal> file system as root partition. In this mode of operation
         the partition definitions in <filename>/usr/lib/repart.d/*.conf</filename> and related directories
         are not read, and <option>--definitions=</option> is not supported, as appropriate definitions for
@@ -605,10 +605,11 @@
       <varlistentry>
         <term><option>--generate-fstab=<replaceable>PATH</replaceable></option></term>
 
-        <listitem><para>Specifies a path where to write fstab entries for the mountpoints configured with
-        <option>MountPoint=</option> in the root directory specified with <option>--copy-source=</option> or
-        <option>--root=</option> or in the host's root directory if neither is specified. Disabled by
-        default.</para>
+        <listitem><para>Specifies a path where to write
+        <citerefentry project='man-pages'><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        entries for the mountpoints configured with <option>MountPoint=</option> in the root directory
+        specified with <option>--copy-source=</option> or <option>--root=</option> or in the host's root
+        directory if neither is specified. Disabled by default.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>
@@ -680,7 +681,7 @@ systemd-confext refresh</programlisting>
       <title>Generate a system extension image and sign it via PKCS11</title>
 
       <para>The following creates a system extension DDI (sysext) for an
-      <filename>/usr/foo</filename> update and signs it with a hardware token via PKCS11.</para>
+      <filename>/usr/foo</filename> update and signs it with a hardware token via PKCS11:</para>
 
       <programlisting>mkdir -p tree/usr/lib/extension-release.d
 echo "Hello World" >tree/usr/foo

man/systemd-resolved.service.xml

@@ -343,10 +343,10 @@ search foobar.com barbar.com
       <listitem><para><command>systemd-resolved</command> maintains the
       <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional
       Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also
-      contains a list of search domains that are in use by systemd-resolved. The list of search domains is
-      always kept up-to-date. Note that <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not
-      be used directly by applications, but only through a symlink from
-      <filename>/etc/resolv.conf</filename>. This file may be symlinked from
+      contains a list of search domains that are in use by <command>systemd-resolved</command>. The list of
+      search domains is always kept up-to-date. Note that
+      <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not be used directly by applications,
+      but only through a symlink from <filename>/etc/resolv.conf</filename>. This file may be symlinked from
       <filename>/etc/resolv.conf</filename> in order to connect all local clients that bypass local DNS APIs
       to <command>systemd-resolved</command> with correct search domains settings. This mode of operation is
       recommended.</para></listitem>

man/systemd-soft-reboot.service.xml

@@ -139,7 +139,8 @@ DefaultDependencies=no</programlisting>
       <varname>Conflicts=umount.target</varname>)</para></listitem>
 
       <listitem><para>If the unit publishes a service over D-Bus, the connection needs to be re-established
-      after soft-reboot as the D-Bus broker will be stopped and then started again. When using the sd-bus
+      after soft-reboot as the D-Bus broker will be stopped and then started again. When using the
+      <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>
       library this can be achieved by adapting the following example.
       <programlisting><xi:include href="sd_bus_service_reconnect.c" parse="text"/></programlisting>
       </para></listitem>

man/systemd-ssh-generator.xml

@@ -34,9 +34,9 @@
 
     <para><command>systemd-ssh-generator</command> binds a socket-activated SSH server to local
     <constant>AF_VSOCK</constant> and <constant>AF_UNIX</constant> sockets under certain conditions. It only
-    has an effect if the <citerefentry
-    project="man-pages"><refentrytitle>sshd</refentrytitle><manvolnum>8</manvolnum></citerefentry> binary is
-    installed. Specifically, it does the following:</para>
+    has an effect if the
+    <citerefentry project="man-pages"><refentrytitle>sshd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+    binary is installed. Specifically, it does the following:</para>
 
     <itemizedlist>
       <listitem><para>If invoked in a VM with <constant>AF_VSOCK</constant> support, a socket-activated SSH
@@ -71,14 +71,14 @@
     <para>The generator will use a packaged <filename>sshd@.service</filename> service template file if one
     exists, and otherwise generate a suitable service template file.</para>
 
-    <para><filename>systemd-ssh-generator</filename> implements
+    <para><command>systemd-ssh-generator</command> implements
     <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
   </refsect1>
 
   <refsect1>
     <title>Kernel Command Line</title>
 
-    <para><filename>systemd-ssh-generator</filename> understands the following
+    <para><command>systemd-ssh-generator</command> understands the following
     <citerefentry><refentrytitle>kernel-command-line</refentrytitle><manvolnum>7</manvolnum></citerefentry>
     parameters:</para>
 
@@ -102,8 +102,9 @@
         times to bind multiple sockets. The syntax should follow the one of <varname>ListenStream=</varname>,
         see
         <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details. This functionality supports all socket families systemd supports, including
-        <constant>AF_INET</constant> and <constant>AF_INET6</constant>.</para>
+        for details. This functionality supports all socket families
+        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> supports,
+        including <constant>AF_INET</constant> and <constant>AF_INET6</constant>.</para>
 
         <xi:include href="version-info.xml" xpointer="v256"/></listitem>
       </varlistentry>

man/systemd-ssh-proxy.xml

@@ -77,7 +77,7 @@ Host .host
     <para>This tool is supposed to be used together with
     <citerefentry><refentrytitle>systemd-ssh-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>
     which when run inside a VM or container will bind SSH to suitable
-    addresses. <command>systemd-ssh-generator</command> is supposed to run in the container of VM guest, and
+    addresses. <command>systemd-ssh-generator</command> is supposed to run in the container or VM guest, and
     <command>systemd-ssh-proxy</command> is run on the host, in order to connect to the container or VM
     guest.</para>
   </refsect1>

man/systemd-stdio-bridge.xml

@@ -43,7 +43,7 @@
 
     <para><citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry> uses
     <command>systemd-stdio-bridge</command> to forward D-Bus connections over
-    <citerefentry project='die-net'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+    <citerefentry project='man-pages'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
     or to connect to the bus of a different user, see
     <citerefentry><refentrytitle>sd_bus_set_address</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
     </para>

man/systemd-stub.xml

@@ -209,7 +209,7 @@
       images to the initrd. See
       <citerefentry><refentrytitle>systemd-confext</refentrytitle><manvolnum>8</manvolnum></citerefentry> for
       details on configuration extension images. The generated <command>cpio</command> archive containing
-      these system extension images is measured into TPM PCR 12 (if a TPM is present).</para></listitem>
+      these configuration extension images is measured into TPM PCR 12 (if a TPM is present).</para></listitem>
 
       <listitem><para>Similarly, files
       <filename><replaceable>foo</replaceable>.efi.extra.d/*.addon.efi</filename> are loaded and verified as

man/systemd-sysext.xml

@@ -141,7 +141,7 @@
     but the used architecture identifiers are the same as for <varname>ConditionArchitecture=</varname>
     described in <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
     <varname>EXTENSION_RELOAD_MANAGER=</varname> can be set to 1 if the extension requires a service manager reload after application
-    of the extension. Note that for the reasons mentioned earlier:
+    of the extension. Note that for the reasons mentioned earlier,
     <ulink url="https://systemd.io/PORTABLE_SERVICES">Portable Services</ulink> remain
     the recommended way to ship system services.
 
@@ -206,13 +206,13 @@
     the underlying host <filename>/usr/</filename> is managed as immutable disk image or is a traditional
     package manager controlled (i.e. writable) tree.</para>
 
-    <para>With systemd-confext one can perform runtime reconfiguration of OS services.
+    <para>With <command>systemd-confext</command> one can perform runtime reconfiguration of OS services.
     Sometimes, there is a need to swap certain configuration parameter values or restart only a specific
     service without deployment of new code or a complete OS deployment. In other words, we want to be able
     to tie the most frequently configured options to runtime updateable flags that can be changed without a
     system reboot. This will help reduce servicing times when there is a need for changing the OS configuration.
     It also provides a reliable tool for managing configuration because all old configuration files disappear when
-    the systemd-confext image is removed.</para></refsect1>
+    the <command>systemd-confext</command> image is removed.</para></refsect1>
 
   <refsect1>
     <title>Mutability</title>

man/systemd-tpm2-generator.xml

@@ -30,7 +30,7 @@
   <refsect1>
     <title>Description</title>
 
-    <para><filename>systemd-tpm2-generator</filename> is a generator that adds a <varname>Wants=</varname>
+    <para><command>systemd-tpm2-generator</command> is a generator that adds a <varname>Wants=</varname>
     dependency from <filename>sysinit.target</filename> to <filename>tpm2.target</filename> when it detects
     that the firmware discovered a TPM2 device but the OS kernel so far did
     not. <filename>tpm2.target</filename> is supposed to act as synchronization point for all services that
@@ -45,7 +45,7 @@
     for it yet. The latter might be useful in environments where a suitable TPM2 driver for the available
     hardware is not available.</para>
 
-    <para><filename>systemd-tpm2-generator</filename> implements
+    <para><command>systemd-tpm2-generator</command> implements
     <citerefentry><refentrytitle>systemd.generator</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
   </refsect1>
 

man/systemd-vmspawn.xml

@@ -45,7 +45,7 @@
     file descriptors must be passed with the names <literal>kvm</literal> and <literal>vhost-vsock</literal>
     respectively.</para>
 
-    <para>Note: on Ubuntu/Debian derivatives systemd-vmspawn requires the user to be in the
+    <para>Note: on Ubuntu/Debian derivatives <command>systemd-vmspawn</command> requires the user to be in the
     <literal>kvm</literal> group to use the VSOCK options.</para>
   </refsect1>
 
@@ -420,7 +420,8 @@
           for more information.</para>
 
           <para>By default <literal>ed25519</literal> keys are generated, however <literal>rsa</literal> keys
-          may also be useful if the VM has a particularly old version of <command>sshd</command>.</para>
+          may also be useful if the VM has a particularly old version of
+          <citerefentry project='man-pages'><refentrytitle>sshd</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
 
           <xi:include href="version-info.xml" xpointer="v256"/>
           </listitem>

man/systemd-vpick.xml

@@ -46,7 +46,7 @@
 
     <para>If the specified path does not reference a <literal>.v/</literal> path (i.e. neither the final
     component ends in <literal>.v</literal>, nor the penultimate does or the final one does contain a triple
-    underscore) it specified path is written unmodified to standard output.</para>
+    underscore) its specified path is written unmodified to standard output.</para>
   </refsect1>
 
   <refsect1>

man/systemd.link.xml

@@ -378,7 +378,7 @@
 
           <para>This setting is useful to configure the <literal>ID_NET_MANAGED_BY=</literal> property which
           declares which network management service shall manage the interface, which is respected by
-          systemd-networkd and others. Use
+          <command>systemd-networkd</command> and others. Use
           <programlisting>Property=ID_NET_MANAGED_BY=io.systemd.Network</programlisting>
           to declare explicitly that <command>systemd-networkd</command> shall manage the interface, or set
           the property to something else to declare explicitly it shall not do so. See
@@ -974,10 +974,10 @@
         <listitem>
           <para>Configures Receive Packet Steering (RPS) list of CPUs to which RPS may forward traffic.
           Takes a list of CPU indices or ranges separated by either whitespace or commas. Alternatively,
-          takes the special value <literal>all</literal> in which will include all available CPUs in the mask.
+          takes the special value <literal>all</literal>, which will include all available CPUs in the mask.
           CPU ranges are specified by the lower and upper CPU indices separated by a dash (e.g. <literal>2-6</literal>).
-          This option may be specified more than once, in which case the specified CPU affinity masks are merged.
-          If an empty string is assigned, the mask is reset, all assignments prior to this will have no effect.
+          This option may be specified more than once, in which case the specified list of CPU ranges are merged.
+          If an empty string is assigned, the list is reset, all assignments prior to this will have no effect.
           Defaults to unset and RPS CPU list is unchanged. To disable RPS when it was previously enabled, use the
           special value <literal>disable</literal>.</para>
 

man/systemd.mount.xml

@@ -293,7 +293,7 @@
         comes from unit fragments, i.e. generated from <filename>/etc/fstab</filename> by <citerefentry>
         <refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry> or loaded from
         a manually configured mount unit, a combination of <varname>Requires=</varname> and <varname>StopPropagatedFrom=</varname>
-        dependencies is set on the backing device. If doesn't, only <varname>Requires=</varname> is used.</para>
+        dependencies is set on the backing device, otherwise only <varname>Requires=</varname> is used.</para>
 
         <xi:include href="version-info.xml" xpointer="v233"/></listitem>
       </varlistentry>
@@ -556,7 +556,7 @@
         for details. This setting is optional.</para>
 
         <para>If the type is <literal>overlay</literal>, and <literal>upperdir=</literal> or
-        <literal>workdir=</literal> are specified as options and they don't exist, they will be created.
+        <literal>workdir=</literal> are specified as options and the directories don't exist, they will be created.
         </para></listitem>
       </varlistentry>
 

man/systemd.net-naming-scheme.xml

@@ -27,18 +27,19 @@
     attributes and the use of this information is configured. This page describes interface naming, i.e. what
     possible names may be generated. Those names are generated by the
     <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    builtin <command>net_id</command> and exported as udev properties
-    (<varname>ID_NET_NAME_ONBOARD=</varname>, <varname>ID_NET_LABEL_ONBOARD=</varname>,
+    builtin <command>net_id</command> and exported as
+    <citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+    properties (<varname>ID_NET_NAME_ONBOARD=</varname>, <varname>ID_NET_LABEL_ONBOARD=</varname>,
     <varname>ID_NET_NAME_PATH=</varname>, <varname>ID_NET_NAME_SLOT=</varname>).</para>
 
     <para>Names and MAC addresses are derived from various stable device metadata attributes. Newer versions
-    of udev take more of these attributes into account, improving (and thus possibly changing) the names and
-    addresses used for the same devices. Different versions of those generation rules are called "naming
-    schemes". The default naming scheme is chosen at compilation time. Usually this will be the latest
-    implemented version, but it is also possible to set one of the older versions to preserve
-    compatibility. This may be useful for example for distributions, which may introduce new versions of
-    systemd in stable releases without changing the naming scheme. The naming scheme may also be overridden
-    using the <varname>net.naming_scheme=</varname> kernel command line switch, see
+    of <command>systemd-udevd</command> take more of these attributes into account, improving (and thus
+    possibly changing) the names and addresses used for the same devices. Different versions of those
+    generation rules are called "naming schemes". The default naming scheme is chosen at compilation time.
+    Usually this will be the latest implemented version, but it is also possible to set one of the older
+    versions to preserve compatibility. This may be useful for example for distributions, which may introduce
+    new versions of systemd in stable releases without changing the naming scheme. The naming scheme may also
+    be overridden using the <varname>net.naming_scheme=</varname> kernel command line switch, see
     <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
     Available naming schemes are described below.</para>
 
@@ -521,7 +522,8 @@
           change introduced in <constant>v254</constant> by default.</para>
 
           <para>If we detect that a PCI device associated with a slot is a PCI bridge, we no longer set
-          <varname>ID_NET_NAME_SLOT</varname>, reverting a change that was introduced in v251.</para>
+          <varname>ID_NET_NAME_SLOT</varname>, reverting a change that was introduced in
+          <constant>v251</constant>.</para>
 
           <xi:include href="version-info.xml" xpointer="v255"/>
           </listitem>
@@ -708,6 +710,7 @@ net:naming:drvirtio_net:*
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><ulink url="https://systemd.io/PREDICTABLE_INTERFACE_NAMES">Predictable Network Interface Names</ulink></member>
       <member><citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
     </simplelist></para>

man/systemd.netdev.xml

@@ -34,10 +34,16 @@
     for a general description of the syntax.</para>
 
     <para>The main Virtual Network Device file must have the extension <filename>.netdev</filename>;
-    other extensions are ignored. Virtual network devices are created as soon as networkd is
-    started. If a netdev with the specified name already exists, networkd will use that as-is rather
-    than create its own. Note that the settings of the pre-existing netdev will not be changed by
-    networkd.</para>
+    other extensions are ignored. Virtual network devices are created as soon as
+    <command>systemd-networkd</command> is started if possible. If a netdev with the specified name already
+    exists, <command>systemd-networkd</command> will try to update the config if the kind of the existing
+    netdev is equivalent to the requested one, otherwise (e.g. when bridge device <filename>foo</filename>
+    exists but bonding device with the same name is configured in a .netdev file) use the existing netdev
+    as-is rather than replacing with the requested netdev. Note, several settings (e.g. vlan ID) cannot be
+    changed after the netdev is created. To change such settings, it is necessary to first remove the
+    existing netdev, and then run <command>networkctl reload</command> command or restart
+    <command>systemd-networkd</command>. See also
+    <citerefentry><refentrytitle>networkctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
 
     <para>The <filename>.netdev</filename> files are read from the files located in the system network
     directory <filename>/usr/lib/systemd/network</filename> and
@@ -588,7 +594,7 @@
           <para>Controls the threshold for broadcast queueing of the macvlan device. Takes the special value
           <literal>no</literal>, or an integer in the range 0…2147483647. When <literal>no</literal> is
           specified, the broadcast queueing is disabled altogether. When an integer is specified, a multicast
-          address will be queued as broadcast if the number of devices using it is greater than the given
+          address will be queued as broadcast if the number of devices using the macvlan is greater than the given
           value. Defaults to unset, and the kernel default will be used.</para>
 
           <xi:include href="version-info.xml" xpointer="v256"/>
@@ -1929,7 +1935,8 @@
           the <command>wg genkey</command> command
           (see <citerefentry project='man-pages'><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>).
           Specially, if the specified key is prefixed with <literal>@</literal>, it is interpreted as
-          the name of the credential from which the actual key shall be read. <command>systemd-networkd.service</command>
+          the name of the credential from which the actual key shall be read.
+          <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
           automatically imports credentials matching <literal>network.wireguard.*</literal>. For more details
           on credentials, refer to
           <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
@@ -2083,7 +2090,7 @@
           i.e. the packets that pass through the tunnel itself. To cause packets to be sent via the tunnel in
           the first place, an appropriate route needs to be added as well — either in the
           <literal>[Routes]</literal> section on the <literal>.network</literal> matching the wireguard
-          interface, or externally to <filename>systemd-networkd</filename>.</para>
+          interface, or externally to <command>systemd-networkd</command>.</para>
 
           <xi:include href="version-info.xml" xpointer="v237"/>
         </listitem>
@@ -2970,7 +2977,7 @@ Independent=yes</programlisting>
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>systemd-networkd</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>systemd-network-generator.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>

man/systemd.network.xml

@@ -887,7 +887,7 @@ DuplicateAddressDetection=none</programlisting></para>
           from the network interface will be appear as coming from the local host. Typically, this should be
           enabled on the downstream interface of routers. Takes one of <literal>ipv4</literal>,
           <literal>ipv6</literal>, <literal>both</literal>, or <literal>no</literal>. Defaults to
-          <literal>no</literal>. Note. Any positive boolean values such as <literal>yes</literal> or
+          <literal>no</literal>. Note that any positive boolean values such as <literal>yes</literal> or
           <literal>true</literal> are now deprecated. Please use one of the values above. Specifying
           <literal>ipv4</literal> or <literal>both</literal> implies <varname>IPv4Forwarding=</varname>
           settings in both .network file for this interface and the global
@@ -928,8 +928,8 @@ DuplicateAddressDetection=none</programlisting></para>
           <para>Takes a boolean. Controls IPv6 Router Advertisement (RA) reception support for the interface.
           If true, RAs are accepted; if false, RAs are ignored. When RAs are accepted, they may trigger the
           start of the DHCPv6 client if the relevant flags are set in the RA data, or if no routers are found
-          on the link. Defaults to false for bridge devices, when IP forwarding is enabled,
-          <varname>IPv6SendRA=</varname> or <varname>KeepMaster=</varname> is enabled. Otherwise, enabled by
+          on the link. Defaults to false for bridge devices, when <varname>IPv6Forwarding=</varname>,
+          <varname>IPv6SendRA=</varname>, or <varname>KeepMaster=</varname> is enabled. Otherwise, enabled by
           default. Cannot be enabled on devices aggregated in a bond device or when link-local addressing is
           disabled.</para>
 
@@ -993,9 +993,9 @@ DuplicateAddressDetection=none</programlisting></para>
           whether the <emphasis>source</emphasis> of the packet would be routed through the interface it came in. If there is no
           route to the source on that interface, the machine will drop the packet. Takes one of
           <literal>no</literal>, <literal>strict</literal>, or <literal>loose</literal>. When <literal>no</literal>,
-          no source validation will be done. When <literal>strict</literal>, mode each incoming packet is tested against the FIB and
+          no source validation will be done. When <literal>strict</literal>, each incoming packet is tested against the FIB and
           if the incoming interface is not the best reverse path, the packet check will fail. By default failed packets are discarded.
-          When <literal>loose</literal>,  mode each incoming packet's source address is tested against the FIB. The packet is dropped
+          When <literal>loose</literal>, each incoming packet's source address is tested against the FIB. The packet is dropped
           only if the source address is not reachable via any interface on that router.
           See <ulink url="https://tools.ietf.org/html/rfc1027">RFC 3704</ulink>.
           When unset, the kernel's default will be used.</para>
@@ -1084,9 +1084,10 @@ DuplicateAddressDetection=none</programlisting></para>
           Advertisement messages intended for another machine by offering its own MAC address as
           destination. Unlike proxy ARP for IPv4, it is not enabled globally, but will only send
           Neighbour Advertisement messages for addresses in the IPv6 neighbor proxy table, which can
-          also be shown by <command>ip -6 neighbour show proxy</command>. systemd-networkd will control
-          the per-interface `proxy_ndp` switch for each configured interface depending on this option.
-          When unset, the kernel's default will be used.</para>
+          also be shown by <command>ip -6 neighbour show proxy</command>.
+          <command>systemd-networkd</command> will control the per-interface `proxy_ndp` switch for each
+          configured interface depending on this option. When unset, the kernel's default will be used.
+          </para>
 
           <xi:include href="version-info.xml" xpointer="v234"/>
         </listitem>
@@ -1096,7 +1097,7 @@ DuplicateAddressDetection=none</programlisting></para>
         <term><varname>IPv6ProxyNDPAddress=</varname></term>
         <listitem>
           <para>An IPv6 address, for which Neighbour Advertisement messages will be proxied. This
-          option may be specified more than once. systemd-networkd will add the
+          option may be specified more than once. <command>systemd-networkd</command> will add the
           <varname>IPv6ProxyNDPAddress=</varname> entries to the kernel's IPv6 neighbor proxy table.
           This setting implies <varname>IPv6ProxyNDP=yes</varname> but has no effect if
           <varname>IPv6ProxyNDP=</varname> has been set to false. When unset, the kernel's default will
@@ -1225,9 +1226,9 @@ DuplicateAddressDetection=none</programlisting></para>
       <varlistentry>
         <term><varname>ConfigureWithoutCarrier=</varname></term>
         <listitem>
-          <para>Takes a boolean. Allows networkd to configure a specific link even if it has no
-          carrier. Defaults to false. If enabled, and the <varname>IgnoreCarrierLoss=</varname> setting
-          is not explicitly set, then it is enabled as well.</para>
+          <para>Takes a boolean. Allows <command>systemd-networkd</command> to configure a specific link even
+          if it has no carrier. Defaults to false. If enabled, and the <varname>IgnoreCarrierLoss=</varname>
+          setting is not explicitly set, then it is enabled as well.</para>
 
           <para>With this enabled, to make the interface enter the <literal>configured</literal> state,
           which is required to make <command>systemd-networkd-wait-online</command> work properly for the
@@ -1455,11 +1456,11 @@ DuplicateAddressDetection=none</programlisting></para>
           <command>ip maddr</command> command would not work if we have an Ethernet switch that does
           IGMP snooping since the switch would not replicate multicast packets on  ports that did not
           have IGMP reports for the multicast addresses. Linux vxlan interfaces created via
-          <command>ip link add vxlan</command> or networkd's netdev kind vxlan have the group option
-          that enables them to do the required join. By extending <command>ip address</command> command
-          with option <literal>autojoin</literal> we can get similar functionality for openvswitch (OVS)
-          vxlan interfaces as well as other tunneling mechanisms that need to receive multicast traffic.
-          Defaults to <literal>no</literal>.</para>
+          <command>ip link add vxlan</command> or <command>systemd-networkd</command>'s netdev kind vxlan
+          have the group option that enables them to do the required join. By extending
+          <command>ip address</command> command with option <literal>autojoin</literal> we can get similar
+          functionality for openvswitch (OVS) vxlan interfaces as well as other tunneling mechanisms that
+          need to receive multicast traffic. Defaults to <literal>no</literal>.</para>
 
           <xi:include href="version-info.xml" xpointer="v232"/>
         </listitem>
@@ -1785,7 +1786,7 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
       <varlistentry>
         <term><varname>L3MasterDevice=</varname></term>
         <listitem>
-          <para>A boolean. Specifies whether the rule is to direct lookups to the tables associated with
+          <para>Takes a boolean. Specifies whether the rule is to direct lookups to the tables associated with
           level 3 master devices (also known as Virtual Routing and Forwarding or VRF devices).
           For further details see <ulink url="https://docs.kernel.org/networking/vrf.html">
           Virtual Routing and Forwarding (VRF)</ulink>. Defaults to false.</para>
@@ -2903,7 +2904,7 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
           Note that if <varname>AllowList=</varname> is configured then <varname>DenyList=</varname> is
           ignored.</para>
           <para>Note that this filters only DHCP offers, so the filtering might not work when
-          <varname>RapidCommit=</varname> is enabled. See also <varname>RapidCommit=</varname> in the above.
+          <varname>RapidCommit=</varname> is enabled. See also <varname>RapidCommit=</varname> above.
           </para>
 
           <xi:include href="version-info.xml" xpointer="v246"/>
@@ -3339,7 +3340,7 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
         <term><varname>UseRedirect=</varname></term>
         <listitem>
           <para>When true (the default), Redirect message sent by the current first-hop router will be
-          accepted, and configures routes to redirected nodes will be configured.</para>
+          accepted, and routes to redirected nodes will be configured.</para>
 
           <xi:include href="version-info.xml" xpointer="v256"/>
         </listitem>
@@ -4076,7 +4077,8 @@ ServerAddress=192.168.0.1/24</programlisting>
           <para>Takes a boolean. When true, the DHCP server will load and save leases in the persistent
           storage. When false, the DHCP server will neither load nor save leases in the persistent storage.
           Hence, bound leases will be lost when the interface is reconfigured e.g. by
-          <command>networkctl reconfigure</command>, or <filename>systemd-networkd.service</filename>
+          <command>networkctl reconfigure</command>, or
+          <citerefentry><refentrytitle>systemd-networkd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
           is restarted. That may cause address conflict on the network. So, please take an extra care when
           disable this setting. When unspecified, the value specified in the same setting in
           <citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
@@ -4260,7 +4262,7 @@ ServerAddress=192.168.0.1/24</programlisting>
       <varlistentry>
         <term><varname>HomeAgent=</varname></term>
 
-        <listitem><para>Takes a boolean. Specifies that IPv6 router advertisements which indicate to hosts that
+        <listitem><para>Takes a boolean. Specifies that IPv6 router advertisements indicate to hosts that
         the router acts as a Home Agent and includes a Home Agent option. Defaults to false. See
         <ulink url="https://tools.ietf.org/html/rfc6275">RFC 6275</ulink> for further details.</para>
 
@@ -4584,10 +4586,9 @@ ServerAddress=192.168.0.1/24</programlisting>
       <varlistentry>
         <term><varname>Priority=</varname></term>
         <listitem>
-          <para>Sets the "priority" of sending packets on this interface.
-          Each port in a bridge may have a different priority which is used
-          to decide which link to use. Lower value means higher priority.
-          It is an integer value between 0 to 63. Networkd does not set any
+          <para>Sets the "priority" of sending packets on this interface. Each port in a bridge may have a
+          different priority which is used to decide which link to use. Lower value means higher priority.
+          It is an integer value between 0 to 63. <command>systemd-networkd</command> does not set any
           default, meaning the kernel default value of 32 is used.</para>
 
           <xi:include href="version-info.xml" xpointer="v234"/>

man/systemd.resource-control.xml

@@ -896,7 +896,7 @@ CPUWeight=20   DisableControllers=cpu              /          \
         <listitem>
           <para>Configures restrictions on the ability of unit processes to invoke <citerefentry
           project='man-pages'><refentrytitle>bind</refentrytitle><manvolnum>2</manvolnum></citerefentry> on a
-          socket. Both allow and deny rules may defined that restrict which addresses a socket may be bound
+          socket. Both allow and deny rules to be defined that restrict which addresses a socket may be bound
           to.</para>
 
           <para><replaceable>bind-rule</replaceable> describes socket properties such as <replaceable>address-family</replaceable>,
@@ -1673,7 +1673,8 @@ DeviceAllow=/dev/loop-control
         <para>When <command>systemd-coredump</command> is handling a coredump for a process from a container,
         if the container's leader process is a descendant of a cgroup with <varname>CoredumpReceive=yes</varname>
         and <varname>Delegate=yes</varname>, then <command>systemd-coredump</command> will attempt to forward
-        the coredump to <command>systemd-coredump</command> within the container.</para>
+        the coredump to <command>systemd-coredump</command> within the container. See also
+        <citerefentry><refentrytitle>systemd-coredump</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
 
         <xi:include href="version-info.xml" xpointer="v255"/></listitem>
       </varlistentry>

man/systemd.service.xml

@@ -1437,7 +1437,7 @@
     <para>The command line accepts <literal>%</literal> specifiers as described in
     <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
 
-    <para>An argument solely consisting of <literal>;</literal> must be escaped, i.e. specified as <literal>\;</literal></para>
+    <para>An argument solely consisting of <literal>;</literal> must be escaped, i.e. specified as <literal>\;</literal>.</para>
 
     <para>Basic environment variable substitution is supported. Use
     <literal>${FOO}</literal> as part of a word, or as a word of its

man/systemd.time.xml

@@ -120,9 +120,8 @@
     <para>The timezone defaults to the current timezone if not specified explicitly.
     It may be given after a space, like above, in which case it can be:
     <literal>UTC</literal>,
-    an entry in the installed IANA timezone database (<literal>CET</literal>, <literal>Asia/Tokyo</literal>, &amp;c.;
-    complete list obtainable with <literal>timedatectl
-    list-timezones</literal> (see
+    an entry in the installed IANA timezone database (e.g. <literal>CET</literal>, <literal>Asia/Tokyo</literal>,
+    where the complete list can be obtained with <command>timedatectl list-timezones</command> (see
     <citerefentry><refentrytitle>timedatectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>)),
     or <literal>±<replaceable>05</replaceable></literal>,
     <literal>±<replaceable>05</replaceable><replaceable>30</replaceable></literal>,

man/systemd.xml

@@ -1238,9 +1238,9 @@
       </itemizedlist>
 
       <para>Signals sent to PID 1 before this message is sent might not be handled correctly yet. A consumer
-      of these messages should parse the value as an unsigned integer indication the level of support. For
-      now only the mentioned level 2 is defined, but later on additional levels might be defined with higher
-      integers, that will implement a superset of the currently defined behaviour.</para>
+      of these messages should parse the value as an unsigned integer that indicates the level of support.
+      For now only the mentioned level 2 is defined, but later on additional levels might be defined with
+      higher integers, that will implement a superset of the currently defined behaviour.</para>
 
       <xi:include href="version-info.xml" xpointer="v256"/></listitem>
 
@@ -1389,8 +1389,8 @@
           <term><option>--crash-action=</option></term>
 
           <listitem><para>Specify what to do when the system manager (PID 1) crashes. This switch has no
-          effect when systemd is running as user instance. See <varname>systemd.crash_action=</varname>
-          above.</para>
+          effect when <command>systemd</command> is running as user instance. See
+          <varname>systemd.crash_action=</varname> above.</para>
 
           <xi:include href="version-info.xml" xpointer="v256"/></listitem>
         </varlistentry>

man/ukify.xml

@@ -220,7 +220,8 @@
           <para>For the <command>inspect</command> verb, the second syntax is used.
           The section <replaceable>NAME</replaceable> will be inspected (if found).
           If the second argument is <literal>text</literal>, the contents will be printed.
-          If the third argument is given, the contents will be saved to file <replaceable>PATH</replaceable>.
+          If the third argument is given, the contents will be saved to the file named
+          <replaceable>PATH</replaceable>.
           </para>
 
           <para>Note that the name is used as-is, and if the section name should start with a dot, it must be

man/user@.service.xml

@@ -52,7 +52,7 @@
     <para>User processes may be started by the <filename>user@.service</filename> instance, in which
     case they will be part of that unit in the system hierarchy. They may also be started elsewhere,
     for example by
-    <citerefentry project='die-net'><refentrytitle>sshd</refentrytitle><manvolnum>8</manvolnum></citerefentry> or a
+    <citerefentry project='man-pages'><refentrytitle>sshd</refentrytitle><manvolnum>8</manvolnum></citerefentry> or a
     display manager like <command>gdm</command>, in which case they form a .scope unit (see
     <citerefentry><refentrytitle>systemd.scope</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
     Both <filename>user@<replaceable>UID</replaceable>.service</filename> and the scope units are
@@ -145,7 +145,7 @@ Control group /:
 …</programlisting>
       <para>User with UID 1000 is logged in using <command>gdm</command> (<filename
       index="false">session-4.scope</filename>) and
-      <citerefentry project='die-net'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+      <citerefentry project='man-pages'><refentrytitle>ssh</refentrytitle><manvolnum>1</manvolnum></citerefentry>
       (<filename index="false">session-19.scope</filename>), and also has a user manager instance
       running (<filename index="false">user@1000.service</filename>).  User with UID 1001 is logged
       in using <command>ssh</command> (<filename index="false">session-20.scope</filename>) and

man/userdbctl.xml

@@ -416,7 +416,7 @@
     <para>The <command>userdbctl</command> tool may be used to make the list of SSH authorized keys possibly
     contained in a user record available to the SSH daemon for authentication. For that configure the
     following in <citerefentry
-    project='die-net'><refentrytitle>sshd_config</refentrytitle><manvolnum>5</manvolnum></citerefentry>:</para>
+    project='man-pages'><refentrytitle>sshd_config</refentrytitle><manvolnum>5</manvolnum></citerefentry>:</para>
 
     <programlisting>…
 AuthorizedKeysCommand /usr/bin/userdbctl ssh-authorized-keys %u

mkosi.conf

@@ -38,9 +38,8 @@ SignExpectedPcr=yes
 
 [Content]
 ExtraTrees=
+        mkosi.extra.common
         mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
-        mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
-        mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
         %O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw
         %O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity
         %O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig

mkosi.images/initrd/mkosi.conf

@@ -6,9 +6,7 @@ Include=
         %D/mkosi.sanitizers
 
 [Content]
-ExtraTrees=
-        %D/mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
-        %D/mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
+ExtraTrees=%D/mkosi.extra.common
 
 Packages=
         findutils

src/basic/missing_namespace.h

@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+/* Root namespace inode numbers, as per include/linux/proc_ns.h in the kernel source tree, since v3.8:
+ * https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98f842e675f96ffac96e6c50315790912b2812be */
+
+#define PROC_IPC_INIT_INO    ((ino_t) UINT32_C(0xEFFFFFFF))
+#define PROC_UTS_INIT_INO    ((ino_t) UINT32_C(0xEFFFFFFE))
+#define PROC_USER_INIT_INO   ((ino_t) UINT32_C(0xEFFFFFFD))
+#define PROC_PID_INIT_INO    ((ino_t) UINT32_C(0xEFFFFFFC))
+#define PROC_CGROUP_INIT_INO ((ino_t) UINT32_C(0xEFFFFFFB))
+#define PROC_TIME_INIT_INO   ((ino_t) UINT32_C(0xEFFFFFFA))

src/basic/namespace-util.c

@@ -12,6 +12,7 @@
 #include "fileio.h"
 #include "missing_fs.h"
 #include "missing_magic.h"
+#include "missing_namespace.h"
 #include "missing_sched.h"
 #include "missing_syscall.h"
 #include "mountpoint-util.h"
@@ -23,17 +24,17 @@
 #include "user-util.h"
 
 const struct namespace_info namespace_info[_NAMESPACE_TYPE_MAX + 1] = {
-        [NAMESPACE_CGROUP] =  { "cgroup", "ns/cgroup", CLONE_NEWCGROUP,                          },
-        [NAMESPACE_IPC]    =  { "ipc",    "ns/ipc",    CLONE_NEWIPC,                             },
-        [NAMESPACE_NET]    =  { "net",    "ns/net",    CLONE_NEWNET,                             },
+        [NAMESPACE_CGROUP] =  { "cgroup", "ns/cgroup", CLONE_NEWCGROUP, PROC_CGROUP_INIT_INO     },
+        [NAMESPACE_IPC]    =  { "ipc",    "ns/ipc",    CLONE_NEWIPC,    PROC_IPC_INIT_INO        },
+        [NAMESPACE_NET]    =  { "net",    "ns/net",    CLONE_NEWNET,    0                        },
         /* So, the mount namespace flag is called CLONE_NEWNS for historical
          * reasons. Let's expose it here under a more explanatory name: "mnt".
          * This is in-line with how the kernel exposes namespaces in /proc/$PID/ns. */
-        [NAMESPACE_MOUNT]  =  { "mnt",    "ns/mnt",    CLONE_NEWNS,                              },
-        [NAMESPACE_PID]    =  { "pid",    "ns/pid",    CLONE_NEWPID,                             },
-        [NAMESPACE_USER]   =  { "user",   "ns/user",   CLONE_NEWUSER,                            },
-        [NAMESPACE_UTS]    =  { "uts",    "ns/uts",    CLONE_NEWUTS,                             },
-        [NAMESPACE_TIME]   =  { "time",   "ns/time",   CLONE_NEWTIME,                            },
+        [NAMESPACE_MOUNT]  =  { "mnt",    "ns/mnt",    CLONE_NEWNS,     0                        },
+        [NAMESPACE_PID]    =  { "pid",    "ns/pid",    CLONE_NEWPID,    PROC_PID_INIT_INO        },
+        [NAMESPACE_USER]   =  { "user",   "ns/user",   CLONE_NEWUSER,   PROC_USER_INIT_INO       },
+        [NAMESPACE_UTS]    =  { "uts",    "ns/uts",    CLONE_NEWUTS,    PROC_UTS_INIT_INO        },
+        [NAMESPACE_TIME]   =  { "time",   "ns/time",   CLONE_NEWTIME,   PROC_TIME_INIT_INO       },
         { /* Allow callers to iterate over the array without using _NAMESPACE_TYPE_MAX. */       },
 };
 
@@ -479,6 +480,28 @@ int namespace_open_by_type(NamespaceType type) {
         return fd;
 }
 
+int namespace_is_init(NamespaceType type) {
+        int r;
+
+        assert(type >= 0);
+        assert(type <= _NAMESPACE_TYPE_MAX);
+
+        if (namespace_info[type].root_inode == 0)
+                return -EBADR; /* Cannot answer this question */
+
+        const char *p = pid_namespace_path(0, type);
+
+        struct stat st;
+        r = RET_NERRNO(stat(p, &st));
+        if (r == -ENOENT)
+                /* If the /proc/ns/<type> API is not around in /proc/ then ns is off in the kernel and we are in the init ns */
+                return proc_mounted() == 0 ? -ENOSYS : true;
+        if (r < 0)
+                return r;
+
+        return st.st_ino == namespace_info[type].root_inode;
+}
+
 int is_our_namespace(int fd, NamespaceType request_type) {
         int clone_flag;
 

src/basic/namespace-util.h

@@ -24,6 +24,7 @@ extern const struct namespace_info {
         const char *proc_name;
         const char *proc_path;
         unsigned int clone_flag;
+        ino_t root_inode;
 } namespace_info[_NAMESPACE_TYPE_MAX + 1];
 
 int pidref_namespace_open(
@@ -74,6 +75,8 @@ int parse_userns_uid_range(const char *s, uid_t *ret_uid_shift, uid_t *ret_uid_r
 
 int namespace_open_by_type(NamespaceType type);
 
+int namespace_is_init(NamespaceType type);
+
 int is_our_namespace(int fd, NamespaceType type);
 
 int is_idmapping_supported(const char *path);

src/basic/virt.c

@@ -585,6 +585,14 @@ static int running_in_cgroupns(void) {
         if (!cg_ns_supported())
                 return false;
 
+        r = namespace_is_init(NAMESPACE_CGROUP);
+        if (r < 0)
+                log_debug_errno(r, "Failed to test if in root cgroup namespace, ignoring: %m");
+        else if (r > 0)
+                return false;
+
+        // FIXME: We really should drop the heuristics below.
+
         r = cg_all_unified();
         if (r < 0)
                 return r;
@@ -645,6 +653,16 @@ static int running_in_cgroupns(void) {
         }
 }
 
+static int running_in_pidns(void) {
+        int r;
+
+        r = namespace_is_init(NAMESPACE_PID);
+        if (r < 0)
+                return log_debug_errno(r, "Failed to test if in root PID namespace, ignoring: %m");
+
+        return !r;
+}
+
 static Virtualization detect_container_files(void) {
         static const struct {
                 const char *file_path;
@@ -790,12 +808,21 @@ check_files:
 
         r = running_in_cgroupns();
         if (r > 0) {
+                log_debug("Running in a cgroup namespace, assuming unknown container manager.");
                 v = VIRTUALIZATION_CONTAINER_OTHER;
                 goto finish;
         }
         if (r < 0)
                 log_debug_errno(r, "Failed to detect cgroup namespace: %m");
 
+        /* Finally, the root pid namespace has an hardcoded inode number of 0xEFFFFFFC since kernel 3.8, so
+         * if all else fails we can check the inode number of our pid namespace and compare it. */
+        if (running_in_pidns() > 0) {
+                log_debug("Running in a pid namespace, assuming unknown container manager.");
+                v = VIRTUALIZATION_CONTAINER_OTHER;
+                goto finish;
+        }
+
         /* If none of that worked, give up, assume no container manager. */
         v = VIRTUALIZATION_NONE;
         goto finish;
@@ -863,6 +890,14 @@ int running_in_userns(void) {
         _cleanup_free_ char *line = NULL;
         int r;
 
+        r = namespace_is_init(NAMESPACE_USER);
+        if (r < 0)
+                log_debug_errno(r, "Failed to test if in root user namespace, ignoring: %m");
+        else if (r > 0)
+                return false;
+
+        // FIXME: We really should drop the heuristics below.
+
         r = userns_has_mapping("/proc/self/uid_map");
         if (r != 0)
                 return r;

src/core/device.c

@@ -1048,9 +1048,6 @@ static void device_enumerate(Manager *m) {
                 _cleanup_set_free_ Set *ready_units = NULL, *not_ready_units = NULL;
                 Device *d;
 
-                if (device_is_processed(dev) <= 0)
-                        continue;
-
                 if (device_setup_units(m, dev, &ready_units, &not_ready_units) < 0)
                         continue;
 

src/fundamental/macro-fundamental.h

@@ -90,8 +90,8 @@
 #  define _fallthrough_
 #endif
 
-#define XSTRINGIFY(x) #x
-#define STRINGIFY(x) XSTRINGIFY(x)
+#define XSTRINGIFY(...) #__VA_ARGS__
+#define STRINGIFY(...) XSTRINGIFY(__VA_ARGS__)
 
 #ifndef __COVERITY__
 #  define VOID_0 ((void)0)

src/fundamental/variadic-fundamental.h

@@ -0,0 +1,555 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+/* This contains macros that all help simplify the use of macros with variadic args. Also provided is a macro
+ * 'helper' that helps provide some commonly used things, such as a unique variable name or temporary
+ * variable.
+ *
+ * Since the C preprocessor does not allow recursive macros, none of these macros may be used to call
+ * themselves, even indirectly (except by using a "trick"; e.g. see __VA_WRAP_RECURSE() below). If you get a
+ * compiler error complaining about "implicit declaration of function" for any of the macros here, it is most
+ * likely due to an attempt to use the macro recursively.
+ *
+ * Some macros operate based on if there are 'any variadic args' or 'no variadic args'; this distinction is
+ * based on the use of __VA_OPT__(). The description 'any variadic args' means __VA_OPT__() evaluates to its
+ * content, and 'no variadic args' means __VA_OPT__() evaluates to nothing. Note that whitespace is not a
+ * preprocessor token, so a single whitespace-only arg is the same as no args. For example these calls all
+ * evaluate to 2:
+ *   VA_IF_ELSE(1,2)
+ *   VA_IF_ELSE(1,2,)
+ *   VA_IF_ELSE(1,2, )
+ *   #define NONE
+ *   VA_IF_ELSE(1,2,NONE)
+ *   VA_IF_ELSE(1,2, NONE)
+ * However, this call evaluates to 1:
+ *   VA_IF_ELSE(1,2,,)
+ */
+
+/* Wraps variadic args in a single group. This can be passed to macros that will then expand the group into
+ * all its variadic args. */
+#define VA_GROUP(...) __VA_ARGS__
+
+/* Evaluates to 'x' if any variadic args, otherwise 'y'. */
+#define VA_IF_ELSE(x, y, ...) _VA_IF_ELSE_MACRO(__VA_ARGS__)(_VA_IF_ELSE_GROUP(x), _VA_IF_ELSE_GROUP(y))
+#define _VA_IF_ELSE_GROUP(...) __VA_ARGS__
+#define _VA_IF_ELSE_MACRO(...) __VA_IF_ELSE_MACRO(__VA_OPT__(1))
+#define __VA_IF_ELSE_MACRO(o) _VA_IF_ELSE ## o
+#define _VA_IF_ELSE1(x, y) x
+#define _VA_IF_ELSE(x, y) y
+
+/* Evaluates to nothing if no variadic args, otherwise 'x'. */
+#define VA_IF(x, ...) VA_IF_ELSE(_VA_IF_GROUP(x), /*false*/, __VA_ARGS__)
+#define _VA_IF_GROUP(...) __VA_ARGS__
+
+/* Same as VA_IF() but negates the condition. */
+#define VA_IF_NOT(x, ...) VA_IF_ELSE(/*true*/, _VA_IF_NOT_GROUP(x), __VA_ARGS__)
+#define _VA_IF_NOT_GROUP(...) __VA_ARGS__
+
+/* Evaluates to token 1 if no variadic args, otherwise nothing. */
+#define VA_NOT(...) VA_IF_NOT(1, __VA_ARGS__)
+
+/* Evaluates to the first variadic arg, otherwise nothing. */
+#define VA_FIRST(...) VA_IF(_VA_FIRST(__VA_ARGS__), __VA_ARGS__)
+#define _VA_FIRST(x, ...) x
+
+/* Evaluates to the rest of the variadic args, after the first, otherwise nothing. */
+#define VA_REST(...) VA_IF(_VA_REST(__VA_ARGS__), __VA_ARGS__)
+#define _VA_REST(x, ...) __VA_ARGS__
+
+/* Evaluates to token , if any variadic args, otherwise nothing. */
+#define VA_COMMA(...) __VA_OPT__(,)
+
+/* Evaluates to token 1 if both args are non-empty (ignoring whitespace), otherwise evaluates to nothing. */
+#define VA_AND(x, y) VA_NOT(VA_NOT(x) VA_NOT(y))
+
+/* Evaluates to token 1 if either arg is non-empty (ignoring whitespace), otherwise evaluates to nothing. */
+#define VA_OR(x, y) VA_IF(1, x y)
+
+/* Evaluates to nothing. */
+#define VA_NOOP(...)
+
+/* Similar to VA_GROUP(), but encloses the variadic args in (), so they are not expanded when passed to other
+ * macros. Unlike VA_GROUP(), this requires the final macro that actually uses the group contents to ungroup it
+ * using VA_UNPGROUP(), or to handle the () directly. */
+#define VA_PGROUP(...) (__VA_ARGS__)
+
+/* Converts a group of args protected with () into a normal VA_GROUP(). 'x' must be a pgroup, i.e. (...). */
+#define VA_UNPGROUP(x) VA_GROUP x
+
+/* Similar to VA_FIRST(), but x is a pgroup. Evaluates to the first arg if present, otherwise nothing. */
+#define VA_PGROUP_FIRST(x) VA_FIRST(VA_UNPGROUP(x))
+
+/* Similar to VA_REST(), but x is a pgroup. Evaluates to a pgroup of the args after the first. If there are
+ * no more args after the first, evaluates to an empty pgroup. */
+#define VA_PGROUP_REST(x) VA_PGROUP(VA_REST(VA_UNPGROUP(x)))
+
+/* Evaluates to token 1 if pgroup is empty, otherwise nothing. */
+#define VA_PGROUP_EMPTY(x) VA_IF_NOT(1, VA_UNPGROUP(x))
+
+/* Similar to VA_PGROUP_EMPTY() but negates the condition. */
+#define VA_PGROUP_NOT_EMPTY(x) VA_NOT(VA_PGROUP_EMPTY(x))
+
+/* Evaluates to 'macro' called with the expanded variadic args. */
+#define VA_MACRO(macro, ...) macro(__VA_ARGS__)
+
+/* Evaluates to x(__VA_ARGS__) if t is non-empty, otherwise y(__VA_ARGS__). */
+#define VA_MACRO_IF_ELSE(x, y, t, ...) VA_IF_ELSE(x, y, t)(__VA_ARGS__)
+
+/* Evaluates to m(__VA_ARGS__) if t is non-empty, otherwise nothing. */
+#define VA_MACRO_IF(m, t, ...) VA_MACRO_IF_ELSE(m, VA_NOOP, t, __VA_ARGS__)
+
+/* Evaluates to m(__VA_ARGS__) if t is empty, otherwise nothing. */
+#define VA_MACRO_IF_NOT(m, t, ...) VA_MACRO_IF_ELSE(VA_NOOP, m, t, __VA_ARGS__)
+
+/* Same as VA_MACRO() but takes a pgroup, which is unpgrouped before passing to the macro. */
+#define VA_MACRO_PGROUP(macro, pgroup) VA_MACRO(macro, VA_UNPGROUP(pgroup))
+
+/* Expands to 'macro' for each variadic arg, which will be called with:
+ *   1) the provided 'context'
+ *   2) a hex iteration number (starting at 0x0001)
+ *   3) the variadic arg
+ *   4...) the rest of the variadic args
+ *
+ * Each expansion of 'macro', except for the last, will be followed by 'separator' called with the same
+ * parameters as 'macro'.
+ *
+ * If there are no variadic args, this evaluates to 'zero' called with the single arg 'context'.
+ *
+ * If there are too many variadic args, this evaluates to 'toomany' called with the single arg 'context'.
+ *
+ * The 'macro', 'separator', 'zero', and 'toomany' parameters must be callable macros. The VA_WRAP_*() macros
+ * below may be used. The 'context' parameter may be anything and is not directly called (except by the
+ * VA_WRAP_*_CONTEXT() below). */
+#define VA_WRAP(macro, separator, context, zero, toomany, ...)          \
+        __VA_WRAP_RECURSE(macro, separator, context, zero, toomany, __VA_ARGS__)
+
+/* These can be used for the VA_WRAP() 'macro' parameter. */
+#define VA_WRAP_MACRO_CONTEXT(c, i, v, ...) c
+#define VA_WRAP_MACRO_INDEX(c, i, v, ...) i
+#define VA_WRAP_MACRO_LAST(c, i, v, ...) VA_IF_NOT(v, __VA_ARGS__)
+#define VA_WRAP_MACRO_LAST_INDEX(c, i, v, ...) VA_IF_NOT(i, __VA_ARGS__)
+#define VA_WRAP_MACRO_NONE(c, i, v, ...)
+#define VA_WRAP_MACRO_VALUE(c, i, v, ...) v
+
+/* These can be used for the VA_WRAP() 'separator' parameter. */
+#define VA_WRAP_SEPARATOR_AND(c, i, v, ...) &&
+#define VA_WRAP_SEPARATOR_COMMA(c, i, v, ...) ,
+#define VA_WRAP_SEPARATOR_COMMA_IF_PREV(c, i, v, ...) VA_COMMA(v)
+#define VA_WRAP_SEPARATOR_CONTEXT(c, i, v, ...) c
+#define VA_WRAP_SEPARATOR_INDEX(c, i, v, ...) i
+#define VA_WRAP_SEPARATOR_NONE(c, i, v, ...)
+#define VA_WRAP_SEPARATOR_SEMICOLON(c, i, v, ...) ;
+
+/* This can be used for the VA_WRAP() 'context' parameter. It is strictly to help with code readability, and
+ * is not required. */
+#define VA_WRAP_CONTEXT_NONE
+
+/* These can be used for the VA_WRAP() 'zero' parameter. */
+#define VA_WRAP_ZERO_0(c) 0
+#define VA_WRAP_ZERO_0x0000(c) 0x0000
+#define VA_WRAP_ZERO_CONTEXT(c) c
+#define VA_WRAP_ZERO_ERROR(c) _Pragma("GCC error \"Zero variadic args.\"")
+#define VA_WRAP_ZERO_FALSE(c) false
+#define VA_WRAP_ZERO_NONE(c)
+#define VA_WRAP_ZERO_TRUE(c) true
+#define VA_WRAP_ZERO_VOID_0(c) VOID_0
+
+/* These can be used for the VA_WRAP() 'toomany' parameter. */
+#define VA_WRAP_TOOMANY_CONTEXT(c) c
+#define VA_WRAP_TOOMANY_ERROR(c) _Pragma("GCC error \"Too many variadic args.\"")
+#define VA_WRAP_TOOMANY_FALSE(c) false
+#define VA_WRAP_TOOMANY_NONE(c)
+#define VA_WRAP_TOOMANY_TRUE(c) true
+
+/* Simple version of VA_WRAP(); each variadic arg is wrapped by the provided macro, separated by commas. No
+ * context is used. Zero args evaluates to nothing. Toomany args results in error. */
+#define VA_MACRO_FOREACH(macro, ...)            \
+        VA_WRAP(macro,                          \
+                VA_WRAP_SEPARATOR_COMMA,        \
+                VA_WRAP_CONTEXT_NONE,           \
+                VA_WRAP_ZERO_NONE,              \
+                VA_WRAP_TOOMANY_ERROR,          \
+                __VA_ARGS__)
+
+/* Expands to list of variadic args, with any "empty" (whitespace only) args removed. This processes the list
+ * twice, to remove a trailing comma if needed. */
+#define VA_FILTER(...)                                          \
+        VA_MACRO(VA_WRAP,                                       \
+                 VA_WRAP_MACRO_VALUE,                           \
+                 VA_WRAP_SEPARATOR_COMMA_IF_PREV,               \
+                 VA_WRAP_CONTEXT_NONE,                          \
+                 VA_WRAP_ZERO_NONE,                             \
+                 VA_WRAP_TOOMANY_ERROR,                         \
+                 VA_WRAP(VA_WRAP_MACRO_VALUE,                   \
+                         VA_WRAP_SEPARATOR_COMMA_IF_PREV,       \
+                         VA_WRAP_CONTEXT_NONE,                  \
+                         VA_WRAP_ZERO_NONE,                     \
+                         VA_WRAP_TOOMANY_ERROR,                 \
+                         __VA_ARGS__))
+
+/* Evaluates to the number of variadic args. */
+#define VA_NARGS(...)                                                   \
+        VA_WRAP(VA_WRAP_MACRO_LAST_INDEX,                               \
+                VA_WRAP_SEPARATOR_NONE,                                 \
+                VA_WRAP_CONTEXT_NONE,                                   \
+                VA_WRAP_ZERO_0x0000,                                    \
+                VA_WRAP_TOOMANY_ERROR,                                  \
+                __VA_ARGS__)
+
+/* Evaluates to the last variadic arg. If there are no variadic args, evaluates to nothing. */
+#define VA_LAST(...)                                                    \
+        VA_WRAP(VA_WRAP_MACRO_LAST,                                     \
+                VA_WRAP_SEPARATOR_NONE,                                 \
+                VA_WRAP_CONTEXT_NONE,                                   \
+                VA_WRAP_ZERO_NONE,                                      \
+                VA_WRAP_TOOMANY_ERROR,                                  \
+                __VA_ARGS__)
+
+#define _VA_DECLARATIONS(macro, name, ...)      \
+        VA_WRAP(macro,                          \
+                VA_WRAP_SEPARATOR_SEMICOLON,    \
+                name,                           \
+                VA_WRAP_ZERO_NONE,              \
+                VA_WRAP_TOOMANY_ERROR,          \
+                __VA_ARGS__)
+
+#define _VA_DECLARATION_TOKEN(x, y) __VA_DECLARATION_TOKEN(x, y)
+#define __VA_DECLARATION_TOKEN(x, y) x ## _ ## y
+
+/* Evaluates to a variable declaration for each variadic arg. Each variadic arg must be a type. Each variable
+ * name is the concatenation of 'name', '_', and the variadic arg index (as a hex number). */
+#define VA_DECLARATIONS(name, ...)                              \
+        _VA_DECLARATIONS(_VA_DECLARATION, name, __VA_ARGS__)
+#define _VA_DECLARATION(c, i, v, ...)           \
+        v _VA_DECLARATION_TOKEN(c, i)
+
+/* Same as VA_DECLARATIONS(), but the variadic args must be variables (or constants). Each declaration
+ * uses __auto_type and is initialized to its corresponding variadic arg. */
+#define VA_INITIALIZED_DECLARATIONS(name, ...)                          \
+        _VA_DECLARATIONS(_VA_INITIALIZED_DECLARATION, name, __VA_ARGS__)
+#define _VA_INITIALIZED_DECLARATION(c, i, v, ...)               \
+        _VA_DECLARATION(c, i, __auto_type, __VA_ARGS__) = (v)
+
+/* Same as VA_INITIALIZED_DECLARATIONS(), but the temp variable is declared with const. */
+#define VA_CONST_INITIALIZED_DECLARATIONS(name, ...)                    \
+        _VA_DECLARATIONS(_VA_CONST_INITIALIZED_DECLARATION, name, __VA_ARGS__)
+#define _VA_CONST_INITIALIZED_DECLARATION(c, i, v, ...)                 \
+        const _VA_INITIALIZED_DECLARATION(c, i, v, __VA_ARGS__)
+
+/* Evaluates to a comma-separated list of tokens by concatenating 'name' and a literal '_' with each variadic
+ * arg index. This will produce the same tokens as the variable names generated by VA_DECLARATIONS(). Note
+ * this does not actually evaluate any of the variadic args. */
+#define VA_TOKENS(name, ...)                                            \
+        VA_WRAP(_VA_TOKEN,                                              \
+                VA_WRAP_SEPARATOR_COMMA,                                \
+                name,                                                   \
+                VA_WRAP_ZERO_NONE,                                      \
+                VA_WRAP_TOOMANY_ERROR,                                  \
+                __VA_ARGS__)
+#define _VA_TOKEN(c, i, v, ...) _VA_DECLARATION_TOKEN(c, i)
+
+/* Evaluates to a comma-separated list of unique tokens using UNIQ_T() for each variadic arg. This is similar
+ * to VA_TOKENS() but uses UNIQ_T() to generate the tokens. */
+#define VA_UNIQ(...)                                                    \
+        VA_WRAP(_VA_UNIQ,                                               \
+                VA_WRAP_SEPARATOR_COMMA,                                \
+                UNIQ,                                                   \
+                VA_WRAP_ZERO_NONE,                                      \
+                VA_WRAP_TOOMANY_ERROR,                                  \
+                __VA_ARGS__)
+#define _VA_UNIQ(c, i, v, ...) UNIQ_T(v, c)
+
+/* This is similar to VA_FILTER(), but we can't use VA_FILTER() because macros can't be used recursively, and
+ * this is called from inside a VA_WRAP() (which VA_FILTER() relies on). */
+#define __VMH_GROUPS(g1, g2, g3, g4, g5)        \
+        g1 VA_IF(VA_COMMA(g1), g2 g3 g4 g5)     \
+        g2 VA_IF(VA_COMMA(g2), g3 g4 g5)        \
+        g3 VA_IF(VA_COMMA(g3), g4 g5)           \
+        g4 VA_IF(VA_COMMA(g4), g5)              \
+        g5
+
+#define __VMH_TOKEN(x, u) __va_macro_helper ## x ## u
+#define __VMH_STATEMENT_EXPRESSION(macro, u, uniq, var, varinit, varconst, direct) \
+        ({                                                              \
+                VA_DECLARATIONS(                  __VMH_TOKEN(_var_,      u), var); \
+                VA_INITIALIZED_DECLARATIONS(      __VMH_TOKEN(_varinit_,  u), varinit); \
+                VA_CONST_INITIALIZED_DECLARATIONS(__VMH_TOKEN(_varconst_, u), varconst); \
+                VA_MACRO(macro,                                         \
+                         __VMH_GROUPS(VA_UNIQ(uniq),                    \
+                                      VA_TOKENS(__VMH_TOKEN(_var_,      u), var), \
+                                      VA_TOKENS(__VMH_TOKEN(_varinit_,  u), varinit), \
+                                      VA_TOKENS(__VMH_TOKEN(_varconst_, u), varconst), \
+                                      VA_GROUP(direct)));               \
+        })
+
+#define __VMH_EXPRESSION(macro, u, uniq, var, varinit, varconst, direct) \
+        VA_MACRO(macro,                                                 \
+                 __VMH_GROUPS(VA_UNIQ(uniq), VA_GROUP(direct),,,))
+
+/* Calls 'macro' with a set of args based on the provided arg groups, in the order shown. Multiple args may
+ * be provided to each group by using VA_GROUP().
+ *
+ * Each arg in the 'uniq' group provides a unique token, named based on the arg token, to the macro in
+ * place of the arg. This is equivalent to UNIQ_T() for each arg.
+ *
+ * Each arg in the 'var' group provides a temporary variable of the specified type to the macro in place of
+ * the arg. All args in this group must be types.
+ *
+ * The 'varinit' group is similar to the 'var' group, but each arg must be a variable or constant, and each
+ * temporary variable is initialized to the value of the provided arg. The macro may use these args without
+ * any concern for side effects.
+ *
+ * The 'varconst' group is similar to the 'varinit' group, but the temporary variables are also marked as
+ * const. The macro should not modify args in this group.
+ *
+ * Each arg in the 'direct' group is provided directly to the macro. */
+#define VA_MACRO_HELPER(macro, uniq, var, varinit, varconst, direct)    \
+        VA_IF_ELSE(__VMH_STATEMENT_EXPRESSION,                          \
+                   __VMH_EXPRESSION,                                    \
+                   var varinit varconst)(macro,                         \
+                                         UNIQ,                          \
+                                         VA_GROUP(uniq),                \
+                                         VA_GROUP(var),                 \
+                                         VA_GROUP(varinit),             \
+                                         VA_GROUP(varconst),            \
+                                         VA_GROUP(direct))
+
+/* Same as VA_MACRO_HELPER() but only with 'uniq' group; all variadic args are put in 'direct' group. */
+#define VA_MACRO_UNIQ(macro, uniq, ...)                                 \
+        VA_MACRO_HELPER(macro,                                          \
+                        VA_GROUP(uniq),                                 \
+                        /* var=      */,                                \
+                        /* varinit=  */,                                \
+                        /* varconst= */,                                \
+                        VA_GROUP(__VA_ARGS__))
+
+/* Same as VA_MACRO_HELPER() but only with 'var' group; all variadic args are put in 'direct' group. */
+#define VA_MACRO_VAR(macro, var, ...)                                   \
+        VA_MACRO_HELPER(macro,                                          \
+                        /* uniq=     */,                                \
+                        VA_GROUP(var),                                  \
+                        /* varinit=  */,                                \
+                        /* varconst= */,                                \
+                        VA_GROUP(__VA_ARGS__))
+
+/* Same as VA_MACRO_HELPER() but only with 'varinit' group; all variadic args are put in 'direct' group. */
+#define VA_MACRO_VARINIT(macro, varinit, ...)                           \
+        VA_MACRO_HELPER(macro,                                          \
+                        /* uniq=     */,                                \
+                        /* var=      */,                                \
+                        VA_GROUP(varinit),                              \
+                        /* varconst= */,                                \
+                        VA_GROUP(__VA_ARGS__))
+
+/* Same as VA_MACRO_HELPER() but only with 'varconst' group; all variadic args are put in 'direct' group. */
+#define VA_MACRO_VARCONST(macro, varconst, ...)                         \
+        VA_MACRO_HELPER(macro,                                          \
+                        /* uniq=    */,                                 \
+                        /* var=     */,                                 \
+                        /* varinit= */,                                 \
+                        VA_GROUP(varconst),                             \
+                        VA_GROUP(__VA_ARGS__))
+
+/* Macros below are complex, internal-use-only macros and should not be used directly. They are used by the
+ * macros above. */
+
+/* Integer increment at the preprocessor stage; each macro evaluates to the next integer. Overflow is not
+ * handled; f wraps to 0. */
+#define __VAI0 1
+#define __VAI1 2
+#define __VAI2 3
+#define __VAI3 4
+#define __VAI4 5
+#define __VAI5 6
+#define __VAI6 7
+#define __VAI7 8
+#define __VAI8 9
+#define __VAI9 a
+#define __VAIa b
+#define __VAIb c
+#define __VAIc d
+#define __VAId e
+#define __VAIe f
+#define __VAIf 0
+
+/* Integer increment carryover; all macros evaluate to 0 except f, which evaluates to 1. */
+#define __VAC0 0
+#define __VAC1 0
+#define __VAC2 0
+#define __VAC3 0
+#define __VAC4 0
+#define __VAC5 0
+#define __VAC6 0
+#define __VAC7 0
+#define __VAC8 0
+#define __VAC9 0
+#define __VACa 0
+#define __VACb 0
+#define __VACc 0
+#define __VACd 0
+#define __VACe 0
+#define __VACf 1
+
+/* Increment x based on carryover c. Requires x to be single hex digit (0-f) and carryover to be 0-1.
+ * Evaluates to 0 if x == f and c == 1, otherwise x+1 if c == 1, otherwise x. */
+#define ___VAI(x, c) ____VAI(x, c)
+#define ____VAI(x, c) ____VAI ## c(x)
+#define ____VAI0(x) x
+#define ____VAI1(x) __VAI ## x
+
+/* Carryover of x based on carryover c. Requires x to be single hex digit (0-f) and carryover to be
+ * 0-1. Evaluates to 1 if x is f and c is 1, otherwise 0. */
+#define ___VAC(x, c) ____VAC(x, c)
+#define ____VAC(x, c) ____VAC ## c(x)
+#define ____VAC0(x) 0
+#define ____VAC1(x) __VAC ## x
+
+/* Carryover of multiple digits. Each calculates the carryover of its digit, with 1 being the least
+ * significant digit, and 4 being the most significant digit. */
+#define ___VAC1(x1)             ___VAC(x1, 1)
+#define ___VAC2(x2, x1)         ___VAC(x2, ___VAC1(x1))
+#define ___VAC3(x3, x2, x1)     ___VAC(x3, ___VAC2(x2, x1))
+#define ___VAC4(x4, x3, x2, x1) ___VAC(x4, ___VAC3(x3, x2, x1))
+
+/* Increment with carryover across all digits. Each evaluate to their digit incremented if there is carryover
+ * from previous digits. */
+#define ___VAI1(x1)             ___VAI(x1, 1)
+#define ___VAI2(x2, x1)         ___VAI(x2, ___VAC1(x1))
+#define ___VAI3(x3, x2, x1)     ___VAI(x3, ___VAC2(x2, x1))
+#define ___VAI4(x4, x3, x2, x1) ___VAI(x4, ___VAC3(x3, x2, x1))
+
+/* Detect overflow. If all digits are f, this causes preprocessor error, otherwise this evaluates to
+ * nothing. */
+#define ___VAIO(x4, x3, x2, x1) ____VAIO(___VAC4(x4, x3, x2, x1))
+#define ____VAIO(c) _____VAIO(c)
+#define _____VAIO(c) ______VAIO ## c()
+#define ______VAIO0()
+#define ______VAIO1() _Pragma("GCC error \"VA increment overflow\"")
+
+/* Increment a 4-digit hex number. Requires pgroup to be a 4-digit hex number pgroup, e.g. (0,1,2,3)
+ * represents 0x0123. Evaluates to a 4-digit hex number pgroup that has been incremented by 1. On overflow, a
+ * preprocessor error is generated. */
+#define __VAINC4(pgroup) ___VAINC4 pgroup
+#define ___VAINC4(x4, x3, x2, x1)               \
+        ___VAIO(x4, x3, x2, x1)                 \
+        (___VAI4(x4, x3, x2, x1),               \
+         ___VAI3(x3, x2, x1),                   \
+         ___VAI2(x2, x1),                       \
+         ___VAI1(x1))
+
+/* Convert a 4-digit hex number pgroup to a standard hex number. Requires pgroup to be a 4-digit hex number
+ * pgroup. Evaluates to a standard hex number for the pgroup, e.g. (a,b,c,d) evalutes to 0xabcd. */
+#define __VANUM4(pgroup) ___VANUM4 pgroup
+#define ___VANUM4(x4, x3, x2, x1) 0x ## x4 ## x3 ## x2 ## x1
+
+/* Nested repeated evaluations. This is what controls when the 'toomany' VA_WRAP() parameter is evaluated. */
+#define __VA_EVAL_0x0002(...) __VA_ARGS__
+#define __VA_EVAL_0x0004(...) __VA_EVAL_0x0002(__VA_EVAL_0x0002(__VA_ARGS__))
+#define __VA_EVAL_0x0008(...) __VA_EVAL_0x0004(__VA_EVAL_0x0004(__VA_ARGS__))
+#define __VA_EVAL_0x0010(...) __VA_EVAL_0x0008(__VA_EVAL_0x0008(__VA_ARGS__))
+#define __VA_EVAL_0x0020(...) __VA_EVAL_0x0010(__VA_EVAL_0x0010(__VA_ARGS__))
+#define __VA_EVAL_0x0040(...) __VA_EVAL_0x0020(__VA_EVAL_0x0020(__VA_ARGS__))
+#define __VA_EVAL_0x0080(...) __VA_EVAL_0x0040(__VA_EVAL_0x0040(__VA_ARGS__))
+#define __VA_EVAL_0x0100(...) __VA_EVAL_0x0080(__VA_EVAL_0x0080(__VA_ARGS__))
+#define __VA_EVAL_0x0200(...) __VA_EVAL_0x0100(__VA_EVAL_0x0100(__VA_ARGS__))
+
+/* This should match the list of macros above. */
+#define __VA_EVAL_STEPS (0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080, 0x0100, 0x0200)
+
+/* Determine which __VA_EVAL_0x* macro to use for the given variadic args. This is a quick evaluation for the
+ * preprocessor and avoids unnecessary reevaluations for complex macro expansions. Evaluates to the smallest
+ * (least evaluations) __VA_EVAL_0x* macro token that can handle the number of provided variadic args. */
+#define __VA_EVAL_MACRO(...) __VA_EVAL_MACRO_CHECK_EACH(__VA_EVAL_STEPS, __VA_ARGS__)
+
+/* Re-evaluates for each step. If __VA_EVAL_STEPS is increased this may need to be increased. */
+#define __VA_EVAL_MACRO_CHECK_EACH(steps, ...) __VA_EVAL_MACRO_EVAL16(__VA_EVAL_MACRO_CHECK(steps, __VA_ARGS__))
+#define __VA_EVAL_MACRO_EVAL02(...) __VA_ARGS__
+#define __VA_EVAL_MACRO_EVAL04(...) __VA_EVAL_MACRO_EVAL02(__VA_EVAL_MACRO_EVAL02(__VA_ARGS__))
+#define __VA_EVAL_MACRO_EVAL08(...) __VA_EVAL_MACRO_EVAL04(__VA_EVAL_MACRO_EVAL04(__VA_ARGS__))
+#define __VA_EVAL_MACRO_EVAL16(...) __VA_EVAL_MACRO_EVAL08(__VA_EVAL_MACRO_EVAL08(__VA_ARGS__))
+
+/* Evaluates to the first __VA_EVAL_0x* macro name that can handle all the variadic args. If there are too
+ * many variadic args for the largest macro to handle, evaluates to nothing. Note this uses the same
+ * preprocessor recursion "trick" as __VA_WRAP_RECURSE() below. */
+#define __VA_EVAL_MACRO_CHECK(steps, ...)                               \
+        ___VA_EVAL_MACRO_CHECK                                          \
+        VA_PGROUP(__VA_EVAL_MACRO_MORE(VA_PGROUP_FIRST(steps), __VA_ARGS__))(steps, __VA_ARGS__)
+
+/* 'x' is the evaluation of __VA_EVAL_MACRO_MORE(); if it is empty, this evaluates to __VA_EVAL_MACRO_OK,
+ * otherwise the tested __VA_EVAL_0x* macro cannot handle all the variadic args, and this evaluates to
+ * __VA_EVAL_MACRO_NEXT. */
+#define ___VA_EVAL_MACRO_CHECK(x) VA_IF_ELSE(__VA_EVAL_MACRO_NEXT, __VA_EVAL_MACRO_OK, x)
+
+/* Move on to testing the next step (i.e. next 0x* value). */
+#define __VA_EVAL_MACRO_NEXT(steps, ...) ___VA_EVAL_MACRO_NEXT(VA_PGROUP_REST(steps), __VA_ARGS__)
+
+/* Test the next step value. If there are no more steps, evaluate to nothing. */
+#define ___VA_EVAL_MACRO_NEXT(steps, ...)                               \
+        VA_MACRO_IF(__VA_EVAL_MACRO_CHECK, VA_PGROUP_NOT_EMPTY(steps), steps, __VA_ARGS__)
+
+/* The first value of 'steps' is acceptable, so evaluate to the corresponding __VA_EVAL_* macro name. */
+#define __VA_EVAL_MACRO_OK(steps, ...) ___VA_EVAL_MACRO_OK(VA_PGROUP_FIRST(steps))
+#define ___VA_EVAL_MACRO_OK(n) ____VA_EVAL_MACRO_OK(n)
+#define ____VA_EVAL_MACRO_OK(n) __VA_EVAL_ ## n
+
+/* Bug in Centos Stream 8 gcc preprocessor doesn't correctly handle __VA_OPT__(); work around it. Once Centos
+ * Stream 8 is no longer supported, this can be dropped. */
+#define __CENTOS_STREAM_8_NONE
+#define __CENTOS_STREAM_8_BUG_CHECK() ___CENTOS_STREAM_8_BUG_CHECK(__CENTOS_STREAM_8_NONE)
+#define ___CENTOS_STREAM_8_BUG_CHECK(...) __VA_OPT__(1)
+#define __VA_EVAL_MACRO_MORE_IF_ONCE(...) __VA_OPT__(1)
+#define __VA_EVAL_MACRO_MORE_IF_TWICE(...) __VA_EVAL_MACRO_MORE_IF_ONCE(__VA_ARGS__)
+#define __VA_EVAL_MACRO_MORE_IF_MACRO()                 \
+        VA_IF_ELSE(__VA_EVAL_MACRO_MORE_IF_TWICE,       \
+                   __VA_EVAL_MACRO_MORE_IF_ONCE,        \
+                   __CENTOS_STREAM_8_BUG_CHECK())
+#define __VA_EVAL_MACRO_MORE_IF() __VA_EVAL_MACRO_MORE_IF_MACRO()
+
+/* Test if the __VA_EVAL_0x* macro for hex number 'n' can handle all the variadic args. Evaluates to 1 if
+ * there are remaining (unhandled) variadic args after all evaluations, otherwise nothing. */
+#define __VA_EVAL_MACRO_MORE(n, ...)                                    \
+        __VA_EVAL_MACRO_MORE_IF()(__VA_EVAL_MACRO_MORE_N(n)(__VA_OPT__(___VA_EVAL_MACRO_MORE(__VA_ARGS__))))
+#define __VA_EVAL_MACRO_MORE_N(n) __VA_EVAL_ ## n
+#define ___VA_EVAL_MACRO_MORE(v, ...) __VA_OPT__(___VA_EVAL_MACRO_MORE_NEXT VA_PGROUP()(__VA_ARGS__))
+#define ___VA_EVAL_MACRO_MORE_NEXT() ___VA_EVAL_MACRO_MORE
+
+/* Recursive macro evaluation. This is intended for use by VA_WRAP() above. This performs the actions
+ * described by VA_WRAP() for each variadic arg.
+ *
+ * This "trick" inspired by:
+ *   https://www.scs.stanford.edu/~dm/blog/va-opt.html
+ *   https://github.com/pfultz2/Cloak/wiki/C-Preprocessor-tricks,-tips,-and-idioms
+ *
+ * This determines the number of re-evaluations required for the provided number of variadic args, then calls
+ * the appropriate __VA_EVAL_0x*() macro with ___VA_WRAP_RECURSE(), providing the initial index of 0x0001. */
+#define __VA_WRAP_RECURSE(macro, separator, context, zero, toomany, ...) \
+        VA_IF_ELSE(__VA_WRAP_RECURSE_NONZERO,                           \
+                   __VA_WRAP_RECURSE_ZERO,                              \
+                   __VA_ARGS__)(macro, separator, context, zero, toomany, __VA_ARGS__)
+#define __VA_WRAP_RECURSE_ZERO(macro, separator, context, zero, toomany, ...) zero(context)
+#define __VA_WRAP_RECURSE_NONZERO(macro, separator, context, zero, toomany, ...) \
+        __VA_WRAP_RECURSE_CHECK_TOOMANY(__VA_EVAL_MACRO(__VA_ARGS__),   \
+                                        macro, separator, context, toomany, __VA_ARGS__)
+#define __VA_WRAP_RECURSE_CHECK_TOOMANY(evalmacro, macro, separator, context, toomany, ...) \
+        VA_IF_ELSE(__VA_WRAP_RECURSE_EVAL,                              \
+                   __VA_WRAP_RECURSE_TOOMANY,                           \
+                   evalmacro)(evalmacro, macro, separator, context, toomany, __VA_ARGS__)
+#define __VA_WRAP_RECURSE_TOOMANY(evalmacro, macro, separator, context, toomany, ...) toomany(context)
+#define __VA_WRAP_RECURSE_EVAL(evalmacro, macro, separator, context, toomany, ...) \
+        evalmacro(___VA_WRAP_RECURSE(macro,                             \
+                                     separator,                         \
+                                     context,                           \
+                                     (0,0,0,1),                         \
+                                     __VA_ARGS__))
+
+/* This is the "trick" macro, which evaluates to the current variadic arg 'value' wrapped by 'macro', and
+ * then (if there are remaining variadic args) followed by 'separator' followed by the "trick"; which is
+ * ___VA_WRAP_NEXT token and VA_PGROUP(). On the next re-evaluation, this (indirectly) evaluates recursively
+ * to ___VA_WRAP_RECURSE(). */
+#define ___VA_WRAP_RECURSE(macro, separator, context, index, value, ...) \
+        ___VA_WRAP_RECURSE_CALL(macro,                                  \
+                                VA_IF_ELSE(separator, VA_NOOP, __VA_ARGS__), \
+                                VA_GROUP(context, __VANUM4(index), value, __VA_ARGS__)) \
+        __VA_OPT__(___VA_WRAP_NEXT VA_PGROUP()(macro, separator, context, __VAINC4(index), __VA_ARGS__))
+#define ___VA_WRAP_RECURSE_CALL(macro, separator, args) macro(args)separator(args)
+#define ___VA_WRAP_NEXT() ___VA_WRAP_RECURSE

src/test/meson.build

@@ -188,6 +188,7 @@ simple_tests += files(
         'test-user-record.c',
         'test-user-util.c',
         'test-utf8.c',
+        'test-variadic.c',
         'test-verbs.c',
         'test-vpick.c',
         'test-web-util.c',

src/test/test-namespace.c

@@ -213,9 +213,23 @@ TEST(idmapping_supported) {
         assert_se(is_idmapping_supported("/etc") >= 0);
 }
 
+TEST(namespace_is_init) {
+        int r;
+
+        for (NamespaceType t = 0; t < _NAMESPACE_TYPE_MAX; t++) {
+                r = namespace_is_init(t);
+                if (r == -EBADR)
+                        log_info_errno(r, "In root namespace of type '%s': don't know", namespace_info[t].proc_name);
+                else {
+                        ASSERT_OK(r);
+                        log_info("In root namespace of type '%s': %s", namespace_info[t].proc_name, yes_no(r));
+                }
+        }
+}
+
 static int intro(void) {
         if (!have_namespaces())
-                return log_tests_skipped("Don't have namespace support");
+                return log_tests_skipped("Don't have namespace support or lacking privileges");
 
         return EXIT_SUCCESS;
 }

src/test/test-variadic.c

@@ -0,0 +1,726 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#include <stddef.h>
+
+#include "log.h"
+#include "string-util.h"
+#include "tests.h"
+#include "variadic-fundamental.h"
+
+#define _MACRO_LOG(...) ({ log_info("%s", #__VA_ARGS__); 0; })
+#define MACRO_LOG(...) _MACRO_LOG(__VA_ARGS__)
+
+#define NONE
+#define MACRO_NONE()
+#define MACRO_IGNORE(...)
+
+#define MACRO1(x, ...) (x)
+#define MACRO2(x1, x2, ...) (x2)
+#define MACRO_SUM12(x1, x2, ...) (x1 + x2)
+
+#define MACRO_3ARG_SUM(x1, x2, x3) x1 + x2 + x3
+#define MACRO_4ARG_SUM(x1, x2, x3, x4) x1 + x2 + x3 + x4
+
+#define MACRO_VARG_1(x1, ...) x1
+#define MACRO_VARG_2(x1, ...) MACRO_VARG_1(__VA_ARGS__)
+#define MACRO_VARG_3(x1, ...) MACRO_VARG_2(__VA_ARGS__)
+#define MACRO_VARG_4(x1, ...) MACRO_VARG_3(__VA_ARGS__)
+
+#define MACRO_GROUP_VARG_1(x) MACRO_VARG_1(x)
+#define MACRO_GROUP_VARG_2(x) MACRO_VARG_2(x)
+#define MACRO_GROUP_VARG_3(x) MACRO_VARG_3(x)
+#define MACRO_GROUP_VARG_4(x) MACRO_VARG_4(x)
+
+#define MACRO_GROUP_3ARG_SUM(x) MACRO_3ARG_SUM(x)
+#define MACRO_GROUP_4ARG_SUM(x) MACRO_4ARG_SUM(x)
+
+#define MACRO_2GROUP_4ARG_3ARG_SUM(g1, g2) MACRO_4ARG_SUM(g1) + MACRO_3ARG_SUM(g2)
+#define MACRO_2GROUP_VARG_3ARG_G2A2(g1, g2) MACRO_VARG_2(g2)
+#define MACRO_2GROUP_4ARG_VARG_SUM_G1A4_G2A3(g1, g2) MACRO_VARG_4(g1) + MACRO_VARG_3(g2)
+
+TEST(va_group) {
+        assert_se(MACRO_GROUP_VARG_4(VA_GROUP(1,2,3,4)) == 4);
+        assert_se(MACRO_GROUP_VARG_1(VA_GROUP(5,10,20)) == 5);
+        assert_se(MACRO_GROUP_3ARG_SUM(VA_GROUP(1, 1000, -2)) == 999);
+        assert_se(MACRO_GROUP_4ARG_SUM(VA_GROUP(1, 1, 1, 2)) == 5);
+        assert_se(MACRO_2GROUP_4ARG_3ARG_SUM(VA_GROUP(5,6,7,8), VA_GROUP(1,1,1)) == 29);
+        assert_se(MACRO_2GROUP_VARG_3ARG_G2A2(VA_GROUP(1,2,3,4,5,6,7,8,9), VA_GROUP(3,2,1)) == 2);
+        assert_se(MACRO_2GROUP_4ARG_VARG_SUM_G1A4_G2A3(VA_GROUP(4,3,2,1), VA_GROUP(9,8,7,6,5,4)) == 8);
+}
+
+#define V1() 1
+#define V2() 2
+
+#define VI6E7(x) VA_IF_ELSE(6, 7, x)
+#define VI8E9(x) VA_IF_ELSE(8, 9, x)
+
+TEST(va_if_else) {
+        assert_se(VA_IF_ELSE(1,2) == 2);
+        assert_se(VA_IF_ELSE(1,2,) == 2);
+        assert_se(VA_IF_ELSE(1,2, ) == 2);
+        assert_se(VA_IF_ELSE(1,2,NONE) == 2);
+        assert_se(VA_IF_ELSE(1,2, NONE) == 2);
+        assert_se(VA_IF_ELSE(1,2,,) == 1);
+        assert_se(VA_IF_ELSE(1, 2, ) == 2);
+        assert_se(VA_IF_ELSE(1, 2,NONE ) == 2);
+        assert_se(VA_IF_ELSE(1, 2, 1) == 1);
+        assert_se(VA_IF_ELSE(1, 2,  "no") == 1);
+        assert_se(VA_IF_ELSE(1, 2, VA_IF(1, )) == 2);
+        assert_se(VA_IF_ELSE(1, 2, VA_IF(1, 1) ) == 1);
+        assert_se(VA_IF_ELSE(1, 2, VA_IF_NOT(1, )) == 1);
+        assert_se(VA_IF_ELSE(1, 2, VA_IF_NOT(1, 2)) == 2);
+        assert_se(VA_IF_ELSE(1, 2, VA_NOT()) == 1);
+        assert_se(VA_IF_ELSE(1, 2, VA_NOT(1)) == 2);
+        assert_se(VA_IF_ELSE(1, 2, VA_IF_ELSE(100, 200, )) == 1);
+        assert_se(VA_IF_ELSE(1, 2, VA_IF_ELSE(100, 200, 1)) == 1);
+        assert_se(VA_IF_ELSE(1, 2, VA_IF_ELSE(100, , )) == 2);
+        assert_se(VA_IF_ELSE(1, 2, VA_IF_ELSE(, 4 , )) == 1);
+        assert_se(VA_IF_ELSE(V1, V2, 1)() == 1);
+        assert_se(VA_IF_ELSE(V1, V2, )() == 2);
+        assert_se(VA_IF_ELSE(VI6E7, VI8E9, )(1) == 8);
+        assert_se(VA_IF_ELSE(VI6E7, VI8E9, 0)(1) == 6);
+        assert_se(VA_IF_ELSE(VI6E7, VI8E9, )() == 9);
+        assert_se(VA_IF_ELSE(VI6E7, VI8E9, 55)() == 7);
+        assert_se(VA_IF_ELSE(VA_IF_ELSE(3, 4,  ), VA_IF_ELSE(5, 6,  ),  ) == 6);
+        assert_se(VA_IF_ELSE(VA_IF_ELSE(3, 4,  ), VA_IF_ELSE(5, 6,  ), 1) == 4);
+        assert_se(VA_IF_ELSE(VA_IF_ELSE(3, 4,  ), VA_IF_ELSE(5, 6, 1),  ) == 5);
+        assert_se(VA_IF_ELSE(VA_IF_ELSE(3, 4,  ), VA_IF_ELSE(5, 6, 1), 1) == 4);
+        assert_se(VA_IF_ELSE(VA_IF_ELSE(3, 4, 1), VA_IF_ELSE(5, 6,  ),  ) == 6);
+        assert_se(VA_IF_ELSE(VA_IF_ELSE(3, 4, 1), VA_IF_ELSE(5, 6,  ), 1) == 3);
+        assert_se(VA_IF_ELSE(VA_IF_ELSE(3, 4, 1), VA_IF_ELSE(5, 6, 1),  ) == 5);
+        assert_se(VA_IF_ELSE(VA_IF_ELSE(3, 4, 1), VA_IF_ELSE(5, 6, 1), 1) == 3);
+}
+
+TEST(va_if) {
+        assert_se(VA_IF(123,1) == 123);
+        assert_se(VA_IF(1+,1) 0 == 1);
+        assert_se(VA_IF(1+,0) 0 == 1);
+        assert_se(VA_IF(1+,) 0 == 0);
+        assert_se(VA_IF(1+,  )0 == 0);
+        assert_se(VA_IF(1+, VA_IF(2+, VA_IF(3+, 4))) 0 == 1);
+        assert_se(VA_IF(1+, VA_IF(2+, VA_IF(3+, ))) 0 == 0);
+        assert_se(VA_IF(1+, VA_IF(, VA_IF(3+, 4))) 0 == 0);
+        assert_se(streq(VA_IF("hi", VA_IF(x,1)) "", "hi"));
+        assert_se(!streq(VA_IF("hi", VA_IF(x,NONE)) "", "hi"));
+}
+
+TEST(va_if_not) {
+        assert_se(VA_IF_NOT(123,) == 123);
+        assert_se(VA_IF_NOT(1+,1) 0 == 0);
+        assert_se(VA_IF_NOT(1+,0) 0 == 0);
+        assert_se(VA_IF_NOT(1+,) 0 == 1);
+        assert_se(VA_IF_NOT(1+,  )0 == 1);
+        assert_se(VA_IF_NOT(1+, VA_IF_NOT(2+, VA_IF_NOT(3+, 4))) 0 == 0);
+        assert_se(VA_IF_NOT(1+, VA_IF_NOT(2+, VA_IF_NOT(3+, ))) 0 == 1);
+        assert_se(VA_IF_NOT(1+, VA_IF_NOT(, VA_IF_NOT(3+, 4))) 0 == 1);
+        assert_se(!streq(VA_IF_NOT("hi", 1) "", "hi"));
+        assert_se(streq(VA_IF_NOT("hi", NONE) "", "hi"));
+}
+
+TEST(va_not) {
+        assert_se(streq(STRINGIFY(VA_NOT()), "1"));
+        assert_se(streq(STRINGIFY(VA_NOT(  )), "1"));
+        assert_se(streq(STRINGIFY(VA_NOT(1)), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(0)), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(1,2,3)), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(,1,)), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(,1)), ""));
+        assert_se(streq(STRINGIFY(VA_NOT("")), ""));
+        assert_se(streq(STRINGIFY(VA_NOT("hi")), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(VA_NOT())), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(VA_NOT(2))), "1"));
+        assert_se(streq(STRINGIFY(VA_NOT(VA_NOT("hi"))), "1"));
+        assert_se(streq(STRINGIFY(VA_NOT(VA_NOT(VA_NOT(2)))), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(VA_NOT(2),VA_NOT(3))), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(VA_NOT(),VA_NOT(3))), ""));
+        assert_se(streq(STRINGIFY(VA_NOT(VA_NOT(2),VA_NOT())), ""));
+}
+
+TEST(va_first) {
+        assert_se(VA_FIRST(1,2,3) == 1);
+        assert_se(VA_FIRST(1+,2+) 0 == 1);
+        assert_se(VA_FIRST(1+) 0 == 1);
+        assert_se(VA_FIRST() 0 == 0);
+        assert_se(streq(STRINGIFY(VA_FIRST()), ""));
+        assert_se(streq(STRINGIFY(VA_FIRST( )), ""));
+        assert_se(streq(STRINGIFY(VA_FIRST(,)), ""));
+        assert_se(streq(STRINGIFY(VA_FIRST(NONE)), ""));
+        assert_se(streq(STRINGIFY(VA_FIRST( NONE )), ""));
+        assert_se(streq(STRINGIFY(VA_FIRST( NONE, )), ""));
+        assert_se(streq(STRINGIFY(VA_FIRST( NONE,1,3 )), ""));
+}
+
+TEST(va_rest) {
+        assert_se(VA_REST(1,3) == 3);
+        assert_se(VA_REST(1+,2+) 0 == 2);
+        assert_se(VA_REST(1+) 0 == 0);
+        assert_se(VA_REST() 0 == 0);
+        assert_se(streq(STRINGIFY(VA_REST(NONE,1)), "1"));
+        assert_se(streq(STRINGIFY(VA_REST(1,NONE,1)), ",1"));
+        assert_se(streq(STRINGIFY(VA_REST(1,NONE)), ""));
+
+        assert_se(VA_FIRST(VA_REST(1,2,3,4,5)) == 2);
+
+        int ia[] = { VA_REST(1,2,3,4,5) };
+        assert_se(ELEMENTSOF(ia) == 4);
+        assert_se(ia[0] == 2);
+        assert_se(ia[1] == 3);
+        assert_se(ia[2] == 4);
+        assert_se(ia[3] == 5);
+}
+
+TEST(va_comma) {
+        assert_se(streq("0 , 1, 2", STRINGIFY(0 VA_COMMA(0) 1, 2)));
+        assert_se(streq("0 , 1, 2", STRINGIFY(0 VA_COMMA(1) 1, 2)));
+        assert_se(streq("0 1, 2", STRINGIFY(0 VA_COMMA() 1, 2)));
+}
+
+TEST(va_and) {
+        assert_se(streq(STRINGIFY(VA_AND(1,2)), "1"));
+        assert_se(streq(STRINGIFY(VA_AND(,2)), ""));
+        assert_se(streq(STRINGIFY(VA_AND(1,)), ""));
+        assert_se(streq(STRINGIFY(VA_AND(,)), ""));
+        assert_se(streq(STRINGIFY(VA_AND(  ,  )), ""));
+        assert_se(streq(STRINGIFY(VA_AND(1  ,  )), ""));
+        assert_se(streq(STRINGIFY(VA_AND(  , 2 )), ""));
+        assert_se(streq(STRINGIFY(VA_AND(  1  , 2 )), "1"));
+        assert_se(streq(STRINGIFY(VA_AND("hi",2)), "1"));
+        assert_se(streq(STRINGIFY(VA_AND(1,"hi")), "1"));
+        assert_se(streq(STRINGIFY(VA_AND("hi","hi")), "1"));
+        assert_se(streq(STRINGIFY(VA_AND(VA_AND(1,2),2)), "1"));
+        assert_se(streq(STRINGIFY(VA_AND(VA_AND(1,),2)), ""));
+        assert_se(streq(STRINGIFY(VA_AND(VA_AND(1,2),)), ""));
+        assert_se(streq(STRINGIFY(VA_AND( VA_AND(  , 1 )  ,  VA_AND(  ,  )  )), ""));
+        assert_se(streq(STRINGIFY(VA_AND( VA_AND(  ,  )  ,  VA_AND(  ,  )  )), ""));
+}
+
+TEST(va_or) {
+        assert_se(streq(STRINGIFY(VA_OR(1,2)), "1"));
+        assert_se(streq(STRINGIFY(VA_OR(,2)), "1"));
+        assert_se(streq(STRINGIFY(VA_OR(1,)), "1"));
+        assert_se(streq(STRINGIFY(VA_OR(,)), ""));
+        assert_se(streq(STRINGIFY(VA_OR("hi",2)), "1"));
+        assert_se(streq(STRINGIFY(VA_OR(1,"hi")), "1"));
+        assert_se(streq(STRINGIFY(VA_OR("hi","hi")), "1"));
+        assert_se(streq(STRINGIFY(VA_OR("hi",)), "1"));
+        assert_se(streq(STRINGIFY(VA_OR(,"hi")), "1"));
+        assert_se(streq(STRINGIFY(VA_OR(  ,  )), ""));
+        assert_se(streq(STRINGIFY(VA_OR(VA_OR(1,),)), "1"));
+        assert_se(streq(STRINGIFY(VA_OR(VA_OR(,),)), ""));
+        assert_se(streq(STRINGIFY(VA_OR(VA_OR(,),2)), "1"));
+        assert_se(streq(STRINGIFY(VA_OR(  VA_OR(1,)  ,  )), "1"));
+        assert_se(streq(STRINGIFY(VA_OR( VA_OR(  , 1 )  ,  VA_OR(  ,  )  )), "1"));
+        assert_se(streq(STRINGIFY(VA_OR( VA_OR(  ,  )  ,  VA_OR(  ,  )  )), ""));
+}
+
+TEST(va_macro) {
+        assert_se(VA_MACRO(MACRO1, 3,2,1) == 3);
+        assert_se(VA_MACRO(MACRO1, 4) == 4);
+        assert_se(VA_MACRO(MACRO2, 4,5) == 5);
+        assert_se(streq(VA_MACRO(MACRO2, 4,"hi"), "hi"));
+}
+
+#define VA_NARGS_MAX_LESS_1                                             \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,010,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,020,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,030,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,040,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,050,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,060,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,070,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,080,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,090,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,0a0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,0b0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,0c0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,0d0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,0e0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,0f0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,100,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,110,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,120,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,130,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,140,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,150,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,160,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,170,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,180,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,190,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,1a0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,1b0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,1c0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,1d0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,1e0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,f,1f0,                              \
+        1,2,3,4,5,6,7,8,9,a,b,c,d,e,  1ff
+
+#define TEST_EQ_STR(expected, result) assert_se(streq(expected, STRINGIFY(result)))
+
+#define XvX(c, i, v, ...) X v X
+
+TEST(va_macro_foreach) {
+        TEST_EQ_STR("", VA_MACRO_FOREACH(XvX));
+        TEST_EQ_STR("", VA_MACRO_FOREACH(XvX,));
+        TEST_EQ_STR("", VA_MACRO_FOREACH(XvX, ));
+        TEST_EQ_STR("X 1 X", VA_MACRO_FOREACH(XvX, 1));
+        TEST_EQ_STR("X 1 X, X 2 X", VA_MACRO_FOREACH(XvX, 1, 2));
+        TEST_EQ_STR("X hi X", VA_MACRO_FOREACH(XvX, hi));
+        TEST_EQ_STR("X one X, X two X, X three X", VA_MACRO_FOREACH(XvX, one, two, three));
+        TEST_EQ_STR("X 1 X, X 2 X, X X, X 4 X, X 5 X", VA_MACRO_FOREACH(XvX, 1, 2, , 4, 5));
+        TEST_EQ_STR("X X, X 2 X, X 3 X, X 4 X, X 5 X", VA_MACRO_FOREACH(XvX, , 2, 3, 4, 5));
+
+        /* Note that if the final arg is empty (or only whitespace), it is not included. */
+        TEST_EQ_STR("X 1 X", VA_MACRO_FOREACH(XvX, 1,));
+        TEST_EQ_STR("X X, X 1 X", VA_MACRO_FOREACH(XvX, ,1));
+        TEST_EQ_STR("X 1 X", VA_MACRO_FOREACH(XvX, 1, ));
+        TEST_EQ_STR("X X, X 1 X", VA_MACRO_FOREACH(XvX,,1));
+        TEST_EQ_STR("X X, X 1 X", VA_MACRO_FOREACH(XvX,,1,));
+        TEST_EQ_STR("X X, X 1 X", VA_MACRO_FOREACH(XvX,,1, ));
+        TEST_EQ_STR("X X, X X, X X, X X", VA_MACRO_FOREACH(XvX, , , , , ));
+        TEST_EQ_STR("X X, X X, X X, X X, X 1 X", VA_MACRO_FOREACH(XvX, , , , , 1));
+        TEST_EQ_STR("X X, X X, X X, X X, X 1 X", VA_MACRO_FOREACH(XvX, , , , ,1));
+        TEST_EQ_STR("X X, X X, X X, X X", VA_MACRO_FOREACH(XvX,,,,,));
+        TEST_EQ_STR("X X, X X, X X, X X, X 1 X", VA_MACRO_FOREACH(XvX,,,,,1));
+        TEST_EQ_STR("X X, X X, X X, X X, X 1 X", VA_MACRO_FOREACH(XvX,,,,, 1));
+}
+
+TEST(va_filter) {
+        TEST_EQ_STR("0, 1, 2, 3, hi, later", VA_FILTER(0, 1, 2, 3, , , , hi, later, ));
+        TEST_EQ_STR("", VA_FILTER(, , , , ,));
+        TEST_EQ_STR("5", VA_FILTER(, , , , ,5));
+        TEST_EQ_STR("4, 5", VA_FILTER(4, , , , ,5));
+        TEST_EQ_STR("6, 7", VA_FILTER(, 6, 7, , ,));
+        TEST_EQ_STR("\"one\", \"two\"", VA_FILTER(, "one", ,"two" , ,));
+}
+
+#define TEST_NARGS(expect, expect_token, ...)                           \
+        ({                                                              \
+                assert_se(VA_NARGS(__VA_ARGS__) == expect);             \
+                assert_se(streq(STRINGIFY(expect_token), STRINGIFY(VA_NARGS(__VA_ARGS__)))); \
+                assert_se(__builtin_constant_p(VA_NARGS(__VA_ARGS__))); \
+        })
+
+TEST(va_nargs) {
+        _unused_ int i = 0;
+        _unused_ const char *hi = "hello";
+
+        TEST_NARGS(0, 0x0000);
+        TEST_NARGS(0, 0x0000,);
+        TEST_NARGS(0, 0x0000, );
+        TEST_NARGS(1, 0x0001, 1);
+        TEST_NARGS(1, 0x0001, "hello");
+        TEST_NARGS(1, 0x0001, "hello");
+        TEST_NARGS(1, 0x0001, i);
+        TEST_NARGS(1, 0x0001, i++);
+        TEST_NARGS(2, 0x0002, i, hi);
+        TEST_NARGS(16, 0x0010, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
+}
+
+TEST(va_last) {
+        _unused_ int i = 0;
+        _unused_ const char *hi = "hello";
+
+        assert_se(streq(STRINGIFY(VA_LAST()), ""));
+        assert_se(VA_LAST(1,2,10) == 10);
+        assert_se(streq(VA_LAST("hi", "there"), "there"));
+        assert_se(VA_LAST(1,2,i++) == 0);
+        assert_se(i == 1);
+        assert_se(VA_LAST(1,2,++i) == 2);
+        assert_se(i == 2);
+        assert_se(VA_LAST(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15) == 15);
+        assert_se(VA_LAST(VA_NARGS_MAX_LESS_1,123) == 123);
+}
+
+TEST(va_declarations) {
+        int i = 999;
+        VA_DECLARATIONS(test_decl, int, char*, uint64_t, typeof(i));
+
+        test_decl_0x0001 = 10;
+        test_decl_0x0002 = (char*)"hello";
+        test_decl_0x0003 = 0xffff000000000001;
+        test_decl_0x0004 = 8;
+        assert_se(test_decl_0x0001 == 10);
+        assert_se(__builtin_types_compatible_p(typeof(test_decl_0x0001), int));
+        assert_se(streq(test_decl_0x0002, "hello"));
+        assert_se(__builtin_types_compatible_p(typeof(test_decl_0x0002), char*));
+        assert_se(test_decl_0x0003 == 0xffff000000000001);
+        assert_se(__builtin_types_compatible_p(typeof(test_decl_0x0003), uint64_t));
+        assert_se(test_decl_0x0004 == 8);
+        assert_se(__builtin_types_compatible_p(typeof(test_decl_0x0004), int));
+
+        VA_DECLARATIONS();
+
+        VA_INITIALIZED_DECLARATIONS(test_i, test_decl_0x0003, test_decl_0x0004, i, test_decl_0x0002, test_decl_0x0001, i);
+
+        assert_se(__builtin_types_compatible_p(typeof(test_i_0x0001), uint64_t));
+        assert_se(test_i_0x0001 == 0xffff000000000001);
+        test_i_0x0001--;
+        assert_se(test_i_0x0001 == 0xffff000000000000);
+        assert_se(test_decl_0x0003 == 0xffff000000000001);
+        test_decl_0x0003 = 0xffff;
+        assert_se(test_i_0x0001 == 0xffff000000000000);
+
+        assert_se(__builtin_types_compatible_p(typeof(test_i_0x0002), int));
+        assert_se(test_i_0x0002 == 8);
+        test_i_0x0002--;
+        assert_se(test_i_0x0002 == 7);
+        assert_se(test_decl_0x0004 == 8);
+        test_decl_0x0004 = 50;
+        assert_se(test_i_0x0002 == 7);
+
+        assert_se(__builtin_types_compatible_p(typeof(test_i_0x0003), int));
+        assert_se(test_i_0x0003 == 999);
+        test_i_0x0003--;
+        assert_se(test_i_0x0003 == 998);
+        assert_se(i == 999);
+        i = 333;
+        assert_se(test_i_0x0003 == 998);
+
+        assert_se(__builtin_types_compatible_p(typeof(test_i_0x0004), char*));
+        assert_se(streq(test_i_0x0004, "hello"));
+        assert_se(streq(test_i_0x0004, test_decl_0x0002));
+        test_i_0x0004 = NULL;
+        assert_se(test_i_0x0004 == NULL);
+        assert_se(streq(test_decl_0x0002, "hello"));
+
+        assert_se(__builtin_types_compatible_p(typeof(test_i_0x0005), int));
+        assert_se(test_i_0x0005 == 10);
+        test_i_0x0005--;
+        assert_se(test_i_0x0005 == 9);
+        assert_se(test_decl_0x0001 == 10);
+        test_decl_0x0001 = 44;
+        assert_se(test_i_0x0005 == 9);
+
+        assert_se(__builtin_types_compatible_p(typeof(test_i_0x0006), int));
+        assert_se(test_i_0x0006 == 999);
+        test_i_0x0006--;
+        assert_se(test_i_0x0006 == 998);
+        assert_se(i == 333);
+        i = 222;
+        assert_se(test_i_0x0006 == 998);
+
+        VA_INITIALIZED_DECLARATIONS();
+}
+
+#define TEST_TOKENS(equal1, equal2, equal3, equal4,                     \
+                    expect1, expect2, expect3, expect4,                 \
+                    v1, v2, v3, v4)                                     \
+        ({                                                              \
+                assert_se((expect1 == v1) == equal1);                   \
+                assert_se((expect2 == v2) == equal2);                   \
+                assert_se((expect3 == v3) == equal3);                   \
+                assert_se((expect4 == v4) == equal4);                   \
+        })
+
+TEST(va_tokens) {
+        int i1 = 10, i2 = 100, i3 = 50, i4 = 99;
+
+        VA_INITIALIZED_DECLARATIONS(test_i_, i1, i2, i3, i4);
+
+        VA_MACRO(TEST_TOKENS, true, true, true, true, i1, i2, i3, i4, VA_TOKENS(test_i_, i1, i2, i3, i4));
+        VA_MACRO(TEST_TOKENS, true, true, true, true, 10, 100, i3, 99, VA_TOKENS(test_i_, i1, i2, i3, i4));
+
+        /* VA_TOKENS() doesn't actually use the variadic args, the tokens are based on index */
+        VA_MACRO(TEST_TOKENS, true, true, true, true, i1, i2, i3, i4, VA_TOKENS(test_i_, x, x, x, x));
+
+        VA_MACRO(TEST_TOKENS, true, false, true, false, i1, i4, i3, 1234, VA_TOKENS(test_i_, i1, i2, i3, i4));
+}
+
+#define TEST_UNIQ(x, y, z)                      \
+        _unused_ int x = 10;                    \
+        _unused_ const char *y = "hi";          \
+        _unused_ uint64_t z = 0xffff;
+
+TEST(va_uniq) {
+        int x = 20;
+        const char *y = "still me";
+        uint64_t z = 0xf;
+
+        VA_MACRO(TEST_UNIQ, VA_UNIQ(first, second, third));
+
+        assert_se(x == 20);
+        assert_se(streq(y, "still me"));
+        assert_se(z == 0xf);
+}
+
+#define TEST_MACRO_SWAP(tmp, x, y)              \
+        ({                                      \
+                tmp = x;                        \
+                x = y;                          \
+                y = tmp;                        \
+        })
+
+#define TEST_MACRO_ALL(u1, u2, v1, v2, vi1, vi2, vc1, vc2, d1, d2)      \
+        ({                                                              \
+                int u1 = 100;                                           \
+                char *u2 = (char*)"u2";                                 \
+                assert_se(u1 == 100);                                   \
+                assert_se(streq(u2, "u2"));                             \
+                                                                        \
+                v1 = d1;                                                \
+                v2 = d2;                                                \
+                assert_se(v1 == 30);                                    \
+                assert_se(streq(v2, "d2"));                             \
+                v1++;                                                   \
+                v2++;                                                   \
+                assert_se(v1 == 31);                                    \
+                assert_se(streq(v2, "2"));                              \
+                                                                        \
+                assert_se(vi1 == 10);                                   \
+                assert_se(streq(vi2, "vi2"));                           \
+                vi1++;                                                  \
+                vi2++;                                                  \
+                assert_se(vi1 == 11);                                   \
+                assert_se(streq(vi2, "i2"));                            \
+                                                                        \
+                assert_se(vc1 == 20);                                   \
+                assert_se(streq(vc2, "vc2"));                           \
+                                                                        \
+                assert_se(d1 == 30);                                    \
+                assert_se(streq(d2, "d2"));                             \
+                                                                        \
+                d1 = u1;                                                \
+                d2 = u2;                                                \
+                assert_se(d1 == 100);                                   \
+                assert_se(streq(d2, "u2"));                             \
+                                                                        \
+                d1 + 1000;                                              \
+        })
+
+TEST(va_macro_helper) {
+        int i1, i2;
+
+        i1 = 10;
+        i2 = 20;
+        VA_MACRO_HELPER(TEST_MACRO_SWAP,
+                        /*uniq*/,
+                        int,
+                        /*varinit*/,
+                        /*varconst*/,
+                        VA_GROUP(i1, i2));
+        assert_se(i1 == 20);
+        assert_se(i2 == 10);
+
+        int vi1 = 10, vc1 = 20, d1 = 30;
+        char *vi2 = (char*)"vi2", *vc2 = (char*)"vc2", *d2 = (char*)"d2";
+        int all = VA_MACRO_HELPER(TEST_MACRO_ALL,
+                                  VA_GROUP(u1, u2),
+                                  VA_GROUP(int, char*),
+                                  VA_GROUP(vi1, vi2),
+                                  VA_GROUP(vc1, vc2),
+                                  VA_GROUP(d1, d2));
+        assert_se(all == 1100);
+        assert_se(vi1 == 10);
+        assert_se(streq(vi2, "vi2"));
+        assert_se(vc1 == 20);
+        assert_se(streq(vc2, "vc2"));
+        assert_se(d1 == 100);
+        assert_se(streq(d2, "u2"));
+}
+
+#define TEST_UNIQ_INT_X(_x)                     \
+        ({                                      \
+                int _x = 5;                     \
+                _x++;                           \
+        })
+
+#define TEST_UNIQ_INT_X_Y_Z(x, y, z, v, ...)            \
+        ({                                              \
+                int x = v;                              \
+                int y = VA_IF_ELSE(VA_FIRST(__VA_ARGS__), 100, __VA_ARGS__); \
+                int z = VA_IF_ELSE(VA_FIRST(VA_REST(__VA_ARGS__)), 2000, VA_REST(__VA_ARGS__)); \
+                x + y + z;                              \
+        })
+
+TEST(va_macro_uniq) {
+        int x = 1, _x = 2;
+
+        int y = VA_MACRO_UNIQ(TEST_UNIQ_INT_X, _x);
+        assert_se(x == 1);
+        assert_se(_x == 2);
+        assert_se(y == 5);
+
+        int z = VA_MACRO_UNIQ(TEST_UNIQ_INT_X_Y_Z, VA_GROUP(x, y, z), x);
+        assert_se(x == 1);
+        assert_se(_x == 2);
+        assert_se(y == 5);
+        assert_se(z == 2101);
+
+        _x = VA_MACRO_UNIQ(TEST_UNIQ_INT_X_Y_Z, VA_GROUP(1, 2, z), 99);
+        assert_se(x == 1);
+        assert_se(_x == 2199);
+        assert_se(y == 5);
+        assert_se(z == 2101);
+
+        z = VA_MACRO_UNIQ(TEST_UNIQ_INT_X_Y_Z, VA_GROUP(_X, _Y, _Z), 5, 20);
+        assert_se(x == 1);
+        assert_se(_x == 2199);
+        assert_se(y == 5);
+        assert_se(z == 2025);
+
+        z = VA_MACRO_UNIQ(TEST_UNIQ_INT_X_Y_Z, VA_GROUP(_X, _Y, _Z), 7, 70, 5000);
+        assert_se(x == 1);
+        assert_se(_x == 2199);
+        assert_se(y == 5);
+        assert_se(z == 5077);
+}
+
+#define TEST_MACRO_INT_CHARP(x1, x2)                                    \
+        ({                                                              \
+                assert_se(__builtin_types_compatible_p(typeof(x1), int)); \
+                assert_se(__builtin_types_compatible_p(typeof(x2), char*)); \
+        })
+
+typedef struct { int a; } structabc;
+
+#define TEST_MACRO_INTP_STRUCTABC_INT(x1, x2, x3)                       \
+        ({                                                              \
+                assert_se(__builtin_types_compatible_p(typeof(x1), int*)); \
+                assert_se(__builtin_types_compatible_p(typeof(x2), structabc)); \
+                assert_se(__builtin_types_compatible_p(typeof(x3), int)); \
+        })
+
+#define TEST_MACRO_INT_TMP1(x)                  \
+        ({                                      \
+                x = 7;                          \
+                x++;                            \
+        })
+
+TEST(va_macro_var) {
+        int j = VA_MACRO_VAR(TEST_MACRO_INT_TMP1, int);
+        assert_se(j == 7);
+
+        assert_se(VA_MACRO_VAR(TEST_MACRO_INT_TMP1, int) == 7);
+
+        VA_MACRO_VAR(TEST_MACRO_INT_CHARP, VA_GROUP(int, char*));
+        VA_MACRO_VAR(TEST_MACRO_INTP_STRUCTABC_INT, VA_GROUP(int*, structabc, int));
+}
+
+#define MACRO_USE_TWICE_1L2_OR_B0(x1, x2)               \
+        ({                                              \
+                (x1 < x2) || (x1 == 0 && x2 == 0);      \
+        })
+
+#define MACRO_INT_USE_ARGS1_EVAL1(x1)                   \
+        ({                                              \
+                _unused_ int x = x1;                    \
+                x1;                                     \
+        })
+
+#define MACRO_INT_USE_ARGS2_EVAL1(x1,x2)                \
+        ({                                              \
+                _unused_ int x = x1 + x2;               \
+                x1;                                     \
+        })
+
+#define MACRO_INT_USE_ARGS2_EVAL2(x1,x2)                \
+        ({                                              \
+                _unused_ int x = x1 + x2;               \
+                x2;                                     \
+        })
+
+#define MACRO_INT_USE_ARGS6_EVAL1(x1,x2,x3,x4,x5,x6)            \
+        ({                                                      \
+                _unused_ int x = x1 + x2 + x3 + x4 + x5 + x6;   \
+                x1;                                             \
+        })
+
+#define MACRO_INT_USE_ARGS6_EVAL4(x1,x2,x3,x4,x5,x6)            \
+        ({                                                      \
+                _unused_ int x = x1 + x2 + x3 + x4 + x5 + x6;   \
+                x4;                                             \
+        })
+
+TEST(va_macro_varinit) {
+        _unused_ int i = 1, j = 0, k = 5678;
+
+        assert_se(VA_MACRO_VARINIT(MACRO_INT_USE_ARGS1_EVAL1, 1) == 1);
+        assert_se(VA_MACRO_VARINIT(MACRO_INT_USE_ARGS2_EVAL1, VA_GROUP(1, 10)) == 1);
+        assert_se(VA_MACRO_VARINIT(MACRO_INT_USE_ARGS2_EVAL2, VA_GROUP(1, 10)) == 10);
+        assert_se(VA_MACRO_VARINIT(MACRO_INT_USE_ARGS6_EVAL1, VA_GROUP(100, 1000, 1, 0, 20, -80)) == 100);
+        assert_se(VA_MACRO_VARINIT(MACRO_INT_USE_ARGS6_EVAL4, VA_GROUP(-9,i,1,k,3,4)) == 5678);
+        assert_se(VA_MACRO_VARINIT(MACRO_SUM12, VA_GROUP(1,10)) == 11);
+        assert_se(VA_MACRO_VARINIT(MACRO_SUM12, VA_GROUP(10,k)) == 5688);
+
+        i = 1234;
+        assert_se(VA_MACRO_VARINIT(MACRO1, i) == 1234);
+        assert_se(VA_MACRO_VARINIT(MACRO1, 1234) == i);
+
+        i = 10;
+        j = 20;
+        assert_se(VA_MACRO_VARINIT(MACRO_USE_TWICE_1L2_OR_B0, VA_GROUP(i++, j--)) == 1);
+        assert_se(i == 11);
+        assert_se(j == 19);
+
+        assert_se(VA_MACRO_VARINIT(MACRO_USE_TWICE_1L2_OR_B0, VA_GROUP(j + 5, j + 10)) == 1);
+        assert_se(i == 11);
+        assert_se(j == 19);
+
+        i = 10;
+        j = 0;
+        assert_se(VA_MACRO_VARINIT(MACRO_USE_TWICE_1L2_OR_B0, VA_GROUP(i - 10, j)) == 1);
+        assert_se(i == 10);
+        assert_se(j == 0);
+
+        assert_se(VA_MACRO_VARINIT(MACRO_USE_TWICE_1L2_OR_B0, VA_GROUP(i, j--)) == 0);
+        assert_se(i == 10);
+        assert_se(j == -1);
+}
+
+TEST(va_macro_varconst) {
+        _unused_ int i = 1, j = 0, k = 4444;
+
+        assert_se(VA_MACRO_VARCONST(MACRO_INT_USE_ARGS1_EVAL1, 1) == 1);
+        assert_se(VA_MACRO_VARCONST(MACRO_INT_USE_ARGS2_EVAL2, VA_GROUP(1, 10)) == 10);
+        assert_se(VA_MACRO_VARCONST(MACRO_INT_USE_ARGS6_EVAL4, VA_GROUP(0,i,1,k,3,4)) == 4444);
+        assert_se(VA_MACRO_VARCONST(MACRO_INT_USE_ARGS6_EVAL1, VA_GROUP(i,2,2,3,4,k)) == 1);
+        assert_se(VA_MACRO_VARCONST(MACRO_INT_USE_ARGS6_EVAL1, VA_GROUP(1000,2,3,4,k,0)) == 1000);
+        assert_se(VA_MACRO_VARCONST(MACRO_SUM12, VA_GROUP(1,10)) == 11);
+        assert_se(VA_MACRO_VARCONST(MACRO_SUM12, VA_GROUP(k,1)) == 4445);
+
+        i = 1234;
+        assert_se(VA_MACRO_VARCONST(MACRO_INT_USE_ARGS1_EVAL1, i) == 1234);
+        assert_se(VA_MACRO_VARCONST(MACRO_INT_USE_ARGS1_EVAL1, 1234) == i);
+}
+
+TEST(va_toomany) {
+        /* Test assumes largest __VA_EVAL_0x*() macro is 0x0200. */
+        assert_se(VA_NARGS(VA_NARGS_MAX_LESS_1) == 0x1ff);
+        assert_se(VA_NARGS(VA_NARGS_MAX_LESS_1,1) == 0x200);
+
+        assert_se(VA_WRAP(VA_WRAP_MACRO_LAST,
+                          VA_WRAP_SEPARATOR_NONE,
+                          -1,
+                          VA_WRAP_ZERO_NONE,
+                          VA_WRAP_TOOMANY_CONTEXT,
+                          VA_NARGS_MAX_LESS_1, -2) == -2);
+        assert_se(VA_WRAP(VA_WRAP_MACRO_LAST,
+                          VA_WRAP_SEPARATOR_NONE,
+                          -1,
+                          VA_WRAP_ZERO_NONE,
+                          VA_WRAP_TOOMANY_CONTEXT,
+                          VA_NARGS_MAX_LESS_1, -2, -3) == -1);
+}
+
+TEST(va_number) {
+        assert_se(___VANUM4(4,3,2,1) == 0x4321);
+        assert_se(___VANUM4(f,f,f,f) == 0xffff);
+        assert_se(___VANUM4(0,0,0,0) == 0);
+        assert_se(___VANUM4(0,0,0,1) == 1);
+        assert_se(___VANUM4(0,1,0,0) == 0x100);
+        assert_se(___VANUM4(1,0,0,1) == 0x1001);
+        assert_se(__VANUM4((1,0,0,1)) == 0x1001);
+}
+
+TEST(va_inc) {
+        assert_se(__VANUM4(__VAINC4((1,2,3,4))) == 0x1235);
+        assert_se(__VANUM4(__VAINC4((0,0,0,0))) == 1);
+        assert_se(__VANUM4(__VAINC4((0,0,0,1))) == 2);
+        assert_se(__VANUM4(__VAINC4((1,0,0,0))) == 0x1001);
+        assert_se(__VANUM4(__VAINC4((f,f,f,e))) == 0xffff);
+        assert_se(__VANUM4(__VAINC4((e,f,f,e))) == 0xefff);
+        assert_se(__VANUM4(__VAINC4((e,f,e,f))) == 0xeff0);
+        assert_se(__VANUM4(__VAINC4((d,f,f,f))) == 0xe000);
+}
+
+DEFINE_TEST_MAIN(LOG_INFO);

test/README.testsuite

@@ -52,14 +52,14 @@ directory (`OutputDirectory=`) to point to the other directory using `mkosi.loca
 After the image has been built, the integration tests can be run with:
 
 ```shell
-$ SYSTEMD_INTEGRATION_TESTS=1 meson test -C build --no-rebuild --suite integration-tests --num-processes "$(($(nproc) / 4))"
+$ env SYSTEMD_INTEGRATION_TESTS=1 meson test -C build --no-rebuild --suite integration-tests --num-processes "$(($(nproc) / 4))"
 ```
 
 As usual, specific tests can be run in meson by appending the name of the test
 which is usually the name of the directory e.g.
 
 ```shell
-$ SYSTEMD_INTEGRATION_TESTS=1 meson test -C build --no-rebuild -v TEST-01-BASIC
+$ env SYSTEMD_INTEGRATION_TESTS=1 meson test -C build --no-rebuild -v TEST-01-BASIC
 ```
 
 See `meson introspect build --tests` for a list of tests.
@@ -69,7 +69,7 @@ To interactively debug a failing integration test, the `--interactive` option
 newer:
 
 ```shell
-$ SYSTEMD_INTEGRATION_TESTS=1 meson test -C build --no-rebuild -i TEST-01-BASIC
+$ env SYSTEMD_INTEGRATION_TESTS=1 meson test -C build --no-rebuild -i TEST-01-BASIC
 ```
 
 Due to limitations in meson, the integration tests do not yet depend on the
@@ -78,7 +78,7 @@ running the integration tests. To rebuild the image and rerun a test, the
 following command can be used:
 
 ```shell
-$ meson compile -C build mkosi && SYSTEMD_INTEGRATION_TESTS=1 meson test -C build --no-rebuild -v TEST-01-BASIC
+$ meson compile -C build mkosi && env SYSTEMD_INTEGRATION_TESTS=1 meson test -C build --no-rebuild -v TEST-01-BASIC
 ```
 
 The integration tests use the same mkosi configuration that's used when you run
@@ -92,7 +92,7 @@ To iterate on an integration test, let's first get a shell in the integration te
 the following:
 
 ```shell
-$ meson compile -C build mkosi && SYSTEMD_INTEGRATION_TESTS=1 TEST_SHELL=1 meson test -C build --no-rebuild -i TEST-01-BASIC
+$ meson compile -C build mkosi && env SYSTEMD_INTEGRATION_TESTS=1 TEST_SHELL=1 meson test -C build --no-rebuild -i TEST-01-BASIC
 ```
 
 This will get us a shell in the integration test environment after booting the machine without running the

test/TEST-02-UNITTESTS/meson.build

@@ -3,6 +3,7 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                'coredump-exclude-regex' : '/(bash|python3.[0-9]+|systemd-executor)$',
                 'cmdline' : integration_test_template['cmdline'] + [
                         '''
 

test/TEST-16-EXTEND-TIMEOUT/meson.build

@@ -4,6 +4,7 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'unit' : files('TEST-16-EXTEND-TIMEOUT.service'),
+                'coredump-exclude-regex' : '/(bash|sleep)$',
         },
 ]
 

test/TEST-17-UDEV/meson.build

@@ -4,5 +4,6 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'vm' : true,
+                'coredump-exclude-regex' : '/(sleep|udevadm)$',
         },
 ]

test/TEST-59-RELOADING-RESTART/meson.build

@@ -3,5 +3,6 @@
 integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
+                'coredump-exclude-regex' : '/(sleep|bash|systemd-notify)$',
         },
 ]

test/TEST-73-LOCALE/meson.build

@@ -4,5 +4,7 @@ integration_tests += [
         integration_test_template + {
                 'name' : fs.name(meson.current_source_dir()),
                 'priority' : 10,
+                # TODO: Remove when https://github.com/systemd/systemd/issues/35335 is fixed.
+                'coredump-exclude-regex' : '/systemd-localed',
         },
 ]

test/TEST-74-AUX-UTILS/meson.build

@@ -5,6 +5,7 @@ integration_tests += [
                 'name' : fs.name(meson.current_source_dir()),
                 'storage': 'persistent',
                 'vm' : true,
+                'coredump-exclude-regex' : '/(test-usr-dump|test-dump|bash)$',
         },
 ]
 

test/integration-test-wrapper.py

@@ -6,6 +6,7 @@
 import argparse
 import json
 import os
+import re
 import shlex
 import subprocess
 import sys
@@ -32,6 +33,59 @@ ExecStart=false
 """
 
 
+def process_coredumps(args: argparse.Namespace, journal_file: Path) -> bool:
+    # Collect executable paths of all coredumps and filter out the expected ones.
+
+    if args.coredump_exclude_regex:
+        exclude_regex = re.compile(args.coredump_exclude_regex)
+    else:
+        exclude_regex = None
+
+    result = subprocess.run(
+        [
+            args.mkosi,
+            '--directory', os.fspath(args.meson_source_dir),
+            '--extra-search-path', os.fspath(args.meson_build_dir),
+            'sandbox',
+            'coredumpctl',
+            '--file', journal_file,
+            '--json=short',
+        ],
+        stdout=subprocess.PIPE,
+        text=True,
+    )  # fmt: skip
+
+    # coredumpctl returns a non-zero exit status if there are no coredumps.
+    if result.returncode != 0:
+        return False
+
+    coredumps = json.loads(result.stdout)
+
+    coredumps = [
+        coredump for coredump in coredumps if not exclude_regex or not exclude_regex.search(coredump['exe'])
+    ]
+
+    if not coredumps:
+        return False
+
+    subprocess.run(
+        [
+            args.mkosi,
+            '--directory', os.fspath(args.meson_source_dir),
+            '--extra-search-path', os.fspath(args.meson_build_dir),
+            'sandbox',
+            'coredumpctl',
+            '--file', journal_file,
+            '--no-pager',
+            'info',
+            *(coredump['exe'] for coredump in coredumps),
+        ],
+        check=True,
+    )  # fmt: skip
+
+    return True
+
+
 def main() -> None:
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('--mkosi', required=True)
@@ -44,6 +98,7 @@ def main() -> None:
     parser.add_argument('--slow', action=argparse.BooleanOptionalAction)
     parser.add_argument('--vm', action=argparse.BooleanOptionalAction)
     parser.add_argument('--exit-code', required=True, type=int)
+    parser.add_argument('--coredump-exclude-regex', required=True)
     parser.add_argument('mkosi_args', nargs='*')
     args = parser.parse_args()
 
@@ -114,7 +169,9 @@ def main() -> None:
             """
         )
 
-    journal_file = None
+    journal_file = (args.meson_build_dir / (f'test/journal/{name}.journal')).absolute()
+    journal_file.unlink(missing_ok=True)
+
     if not sys.stderr.isatty():
         dropin += textwrap.dedent(
             """
@@ -122,9 +179,6 @@ def main() -> None:
             FailureAction=exit
             """
         )
-
-        journal_file = (args.meson_build_dir / (f'test/journal/{name}.journal')).absolute()
-        journal_file.unlink(missing_ok=True)
     elif not shell:
         dropin += textwrap.dedent(
             """
@@ -194,15 +248,16 @@ def main() -> None:
             )
             exit(77)
 
-    if journal_file and (
-        keep_journal == '0' or (result.returncode in (args.exit_code, 77) and keep_journal == 'fail')
+    coredumps = process_coredumps(args, journal_file)
+
+    if keep_journal == '0' or (
+        keep_journal == 'fail' and result.returncode in (args.exit_code, 77) and not coredumps
     ):
         journal_file.unlink(missing_ok=True)
 
-    if shell or result.returncode in (args.exit_code, 77):
+    if shell or (result.returncode in (args.exit_code, 77) and not coredumps):
         exit(0 if shell or result.returncode == args.exit_code else 77)
 
-    if journal_file:
     ops = []
 
     if os.getenv('GITHUB_ACTIONS'):
@@ -228,10 +283,7 @@ def main() -> None:
 
     ops += [f'journalctl --file {journal_file} --no-hostname -o short-monotonic -u {args.unit} -p info']
 
-        print(
-            "Test failed, relevant logs can be viewed with: \n\n" f"{(' && '.join(ops))}\n",
-            file=sys.stderr,
-        )
+    print("Test failed, relevant logs can be viewed with: \n\n" f"{(' && '.join(ops))}\n", file=sys.stderr)
 
     # 0 also means we failed so translate that to a non-zero exit code to mark the test as failed.
     exit(result.returncode or 1)

test/meson.build

@@ -297,6 +297,7 @@ integration_test_template = {
         'qemu-args' : [],
         'exit-code' : 123,
         'vm' : false,
+        'coredump-exclude-regex' : '',
 }
 testdata_subdirs = [
         'auxv',
@@ -391,6 +392,7 @@ foreach integration_test : integration_tests
                 '--storage', integration_test['storage'],
                 '--firmware', integration_test['firmware'],
                 '--exit-code', integration_test['exit-code'].to_string(),
+                '--coredump-exclude-regex', integration_test['coredump-exclude-regex'],
         ]
 
         if 'unit' in integration_test

test/networkd-test.py

@@ -248,6 +248,7 @@ Bridge=mybridge
 [Match]
 Name=mybridge
 [Network]
+IPv6AcceptRA=no
 DNS=192.168.250.1
 Address=192.168.250.33/24
 Gateway=192.168.250.1
@@ -540,6 +541,7 @@ MACAddress=12:34:56:78:9a:bc
 [Match]
 Name=dummy0
 [Network]
+IPv6AcceptRA=no
 Address=192.168.42.100/24
 DNS=192.168.42.1
 Domains= ~company
@@ -573,6 +575,7 @@ MACAddress=12:34:56:78:9a:bc
         self.write_network('50-myvpn.network', '''[Match]
 Name=dummy0
 [Network]
+IPv6AcceptRA=no
 Address=192.168.42.100/24
 DNS=192.168.42.1
 Domains= ~company ~.
@@ -927,6 +930,7 @@ cat <<EOF >/run/systemd/network/50-test.network
 Name={ifr}
 
 [Network]
+IPv6AcceptRA=no
 Address=192.168.5.1/24
 {addr6}
 DHCPServer=yes
@@ -1006,6 +1010,7 @@ MACAddress=12:34:56:78:9a:bc
 [Match]
 Name=dummy0
 [Network]
+IPv6AcceptRA=no
 Address=192.168.42.100/24
 DNS=192.168.42.1
 Domains= one two three four five six seven eight nine ten
@@ -1035,6 +1040,7 @@ MACAddress=12:34:56:78:9a:bc
 [Match]
 Name=dummy0
 [Network]
+IPv6AcceptRA=no
 Address=192.168.42.100/24
 DNS=192.168.42.1
 ''')
@@ -1107,7 +1113,12 @@ class MatchClientTest(unittest.TestCase, NetworkdTestingUtilities):
     def test_basic_matching(self):
         """Verify the Name= line works throughout this class."""
         self.add_veth_pair('test_if1', 'fake_if2')
-        self.write_network('50-test.network', "[Match]\nName=test_*\n[Network]")
+        self.write_network('50-test.network', '''\
+[Match]
+Name=test_*
+[Network]
+IPv6AcceptRA=no
+''')
         subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
         self.assert_link_states(test_if1='managed', fake_if2='unmanaged')
 
@@ -1118,11 +1129,13 @@ class MatchClientTest(unittest.TestCase, NetworkdTestingUtilities):
         mac = '00:01:02:03:98:99'
         self.add_veth_pair('test_veth', 'test_peer',
                            ['addr', mac], ['addr', mac])
-        self.write_network('50-no-veth.network', """\
+        self.write_network('50-no-veth.network', '''\
 [Match]
 MACAddress={}
 Name=!nonexistent *peer*
-[Network]""".format(mac))
+[Network]
+IPv6AcceptRA=no
+'''.format(mac))
         subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
         self.assert_link_states(test_veth='managed', test_peer='unmanaged')
 

test/units/TEST-17-UDEV.device_is_processing.sh

@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# shellcheck disable=SC2317
+set -ex
+set -o pipefail
+
+# This is a reproducer of issue #35329,
+# which is a regression caused by 405be62f05d76f1845f347737b5972158c79dd3e.
+
+IFNAME=udevtestnetif
+
+at_exit() {
+    set +e
+
+    systemctl stop testsleep.service
+    rm -f /run/udev/udev.conf.d/timeout.conf
+    rm -f /run/udev/rules.d/99-testsuite.rules
+    # Forcibly kills sleep command invoked by the udev rule before restarting,
+    # otherwise systemctl restart below will takes longer.
+    killall -KILL sleep
+    systemctl restart systemd-udevd.service
+    ip link del "$IFNAME"
+}
+
+trap at_exit EXIT
+
+udevadm settle
+
+mkdir -p /run/udev/udev.conf.d/
+cat >/run/udev/udev.conf.d/timeout.conf <<EOF
+event_timeout=1h
+EOF
+
+mkdir -p /run/udev/rules.d/
+cat >/run/udev/rules.d/99-testsuite.rules <<EOF
+SUBSYSTEM=="net", ACTION=="change", KERNEL=="${IFNAME}", OPTIONS="log_level=debug", RUN+="/usr/bin/sleep 1000"
+EOF
+
+systemctl restart systemd-udevd.service
+
+ip link add "$IFNAME" type dummy
+IFINDEX=$(ip -json link show "$IFNAME" | jq '.[].ifindex')
+udevadm wait --timeout 10 "/sys/class/net/${IFNAME}"
+# Check if the database file is created.
+[[ -e "/run/udev/data/n${IFINDEX}" ]]
+
+systemd-run \
+    -p After="sys-subsystem-net-devices-${IFNAME}.device" \
+    -p BindsTo="sys-subsystem-net-devices-${IFNAME}.device" \
+    -u testsleep.service \
+    sleep 1h
+
+timeout 10 bash -c 'until systemctl is-active testsleep.service; do sleep .5; done'
+
+udevadm trigger "/sys/class/net/${IFNAME}"
+timeout 30 bash -c "until grep -F 'ID_PROCESSING=1' /run/udev/data/n${IFINDEX}; do sleep .5; done"
+
+for _ in {1..3}; do
+    systemctl daemon-reexec
+    systemctl is-active testsleep.service
+done
+
+for _ in {1..3}; do
+    systemctl daemon-reload
+    systemctl is-active testsleep.service
+done
+
+# Check if the reexec and reload have finished during processing the event.
+grep -F 'ID_PROCESSING=1' "/run/udev/data/n${IFINDEX}"
+
+exit 0

test/units/TEST-22-TMPFILES.sh

@@ -6,6 +6,14 @@ set -o pipefail
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh
 
+if systemd-detect-virt --quiet --container; then
+    # This comes from the selinux package and tries to write
+    # some files under sysfs, which will be read-only in a container,
+    # so mask it. It's not our tmpfiles.d file anyway.
+    mkdir -p /run/tmpfiles.d/
+    ln -s /dev/null /run/tmpfiles.d/selinux-policy.conf
+fi
+
 run_subtests
 
 touch /testok

test/units/TEST-74-AUX-UTILS.detect-virt.sh

@@ -5,3 +5,7 @@ set -o pipefail
 
 SYSTEMD_IN_CHROOT=1 systemd-detect-virt --chroot
 (! SYSTEMD_IN_CHROOT=0 systemd-detect-virt --chroot)
+
+if ! systemd-detect-virt -c; then
+    unshare --mount-proc --fork --user --pid systemd-detect-virt --container
+fi