Merge pull request #32263 from YHNdnzj/cg-read-pid

core/execute: also check cg_is_threaded for clone3()

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 549421a1cfdbbc335550be515aceecad9193db35..f3ba2cab8d0dcc4cba6e8e8c2755aa251e23e099 100644 (file)
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -140,6 +140,7 @@ body:
         - 'systemd-udevd'
         - 'systemd-userdb'
         - 'systemd-veritysetup'
+        - 'systemd-vmspawn'
         - 'systemd-xdg-autostart-generator'
         - 'timedatectl'
         - 'udevadm'

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 76b95a127a3173e1fc25667608bee06dbb7f82df..645cef916732d53cf57606c3f2dda43651dc35d6 100644 (file)
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -81,6 +81,7 @@ body:
         - 'systemd-udevd'
         - 'systemd-userdb'
         - 'systemd-veritysetup'
+        - 'systemd-vmspawn'
         - 'systemd-xdg-autostart-generator'
         - 'timedatectl'
         - 'udevadm'

diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml
index e6ae5dc68fa68520e84489738e6b8bda5b7a542f..bee39e8285222dbb5c55e447dc0d5aca5d6a9171 100644 (file)
--- a/.github/advanced-issue-labeler.yml
+++ b/.github/advanced-issue-labeler.yml
@@ -145,5 +145,8 @@ policy:
           - name: veritysetup
             keys: ['systemd-veritysetup']
 
+          - name: vmspawn
+            keys: ['systemd-vmspawn']
+
           - name: xdg-autostart
             keys: ['systemd-xdg-autostart-generator']

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 0e878236874d715eec38e93a9773f28be1377693..524e1e05d35bc7f55127d064656d0162cc16878d 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -74,7 +74,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
-    - uses: systemd/mkosi@1099ead1ccaa11b62b7a16ee312193bd0e6b6404
+    - uses: systemd/mkosi@5fd70560a1b1ac854b9e1c5a450df311f9000121
 
     # Freeing up disk space with rm -rf can take multiple minutes. Since we don't need the extra free space
     # immediately, we remove the files in the background. However, we first move them to a different location
@@ -100,7 +100,6 @@ jobs:
         ToolsTree=default
         ToolsTreeDistribution=fedora
         QemuVsock=yes
-        # Sometimes we run on a host with /dev/kvm, but it is broken, so explicitly disable it
         QemuKvm=yes
         # TODO: Drop once https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2038777 is fixed in Github Actions
         QemuFirmware=uefi
@@ -112,6 +111,7 @@ jobs:
         tee mkosi.conf.d/99-ci.conf <<EOF
         [Host]
         KernelCommandLineExtra=systemd.unit=mkosi-check-and-shutdown.service
+                               systemd.log_level=debug
                                systemd.journald.max_level_console=debug
                                # udev's debug log output is very verbose, so up it to info in CI.
                                udev.log_level=info

diff --git a/man/custom-html.xsl b/man/custom-html.xsl
index 8b21e15fdae6f764b69b33168f2ce880f1aff643..e5551fc798a2e0c73113df26a85e8de054122f18 100644 (file)
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -54,18 +54,6 @@
   </a>
 </xsl:template>
 
-<xsl:template match="citerefentry[@project='wireguard']">
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>https://git.zx2c4.com/WireGuard/about/src/tools/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>.</xsl:text>
-      <xsl:value-of select="manvolnum"/>
-    </xsl:attribute>
-    <xsl:call-template name="inline.charseq"/>
-  </a>
-</xsl:template>
-
 <xsl:template match="citerefentry[@project='mankier']">
   <a>
     <xsl:attribute name="href">
@@ -81,13 +69,11 @@
 <xsl:template match="citerefentry[@project='archlinux']">
   <a>
     <xsl:attribute name="href">
-      <xsl:text>https://www.archlinux.org/</xsl:text>
-      <xsl:value-of select="refentrytitle"/>
-      <xsl:text>/</xsl:text>
+      <xsl:text>https://man.archlinux.org/man/</xsl:text>
       <xsl:value-of select="refentrytitle"/>
       <xsl:text>.</xsl:text>
       <xsl:value-of select="manvolnum"/>
-      <xsl:text>.html</xsl:text>
+      <xsl:text>.en.html</xsl:text>
     </xsl:attribute>
     <xsl:call-template name="inline.charseq"/>
   </a>

diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 5908f98e68a7c524efe34db8699843b9089f60c3..6fc18e71e377604d46ea8d67ad48970c19bb5e2e 100644 (file)
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -92,7 +92,7 @@
     <para>Depending on which build-time options are enabled, functions that operate on
     <structname>sd_journal</structname> objects might cause optional shared libraries to be dynamically
     loaded via
-    <citerefentry project='man7'><refentrytitle>dlopen</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
+    <citerefentry project='man-pages'><refentrytitle>dlopen</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     such as decompression libraries (xz, lz4, zstd) or cryptographic libraries (gcrypt).
     </para>
   </refsect1>

diff --git a/man/systemd-vmspawn.xml b/man/systemd-vmspawn.xml
index da3ac84a4027eb1a07615afd7b0866a3deeb9756..755040c1cb4c0599b8a97115a2bf8f5cbe2bd18f 100644 (file)
--- a/man/systemd-vmspawn.xml
+++ b/man/systemd-vmspawn.xml
@@ -31,8 +31,8 @@
 
   <refsect1>
     <title>Description</title>
-    <para><command>systemd-vmspawn</command> may be used to start a virtual machine from an OS image. In many ways it is similar to <citerefentry
-    project='man-pages'><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, but
+    <para><command>systemd-vmspawn</command> may be used to start a virtual machine from an OS image. In many ways it is similar to <citerefentry>
+    <refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>, but
     launches a full virtual machine instead of using namespaces.</para>
 
     <para>File descriptors for <filename>/dev/kvm</filename> and <filename>/dev/vhost-vsock</filename> can be
@@ -165,10 +165,10 @@
           <listitem>
             <para>Configure whether to use VM with a virtual TPM or not.</para>
 
-            <para>If the option is not specified vmspawn will detect the presence of <citerefentry project='man-pages'>
+            <para>If the option is not specified vmspawn will detect the presence of <citerefentry project='debian'>
             <refentrytitle>swtpm</refentrytitle><manvolnum>8</manvolnum></citerefentry> and use it if available.
-            If yes is specified <citerefentry project='man-pages'><refentrytitle>swtpm</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-            is always used, and vice versa if no is set <citerefentry project='man-pages'><refentrytitle>swtpm</refentrytitle>
+            If yes is specified <citerefentry project='debian'><refentrytitle>swtpm</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+            is always used, and vice versa if no is set <citerefentry project='debian'><refentrytitle>swtpm</refentrytitle>
             <manvolnum>8</manvolnum></citerefentry> is never used.</para>
 
             <para>Note: the virtual TPM used may change in future.</para>
@@ -330,10 +330,10 @@
           <term><option>--private-users=</option><replaceable>UID_SHIFT[:UID_RANGE]</replaceable></term>
 
           <listitem><para>Controls user namespacing under <option>--directory=</option>.
-          If enabled, <citerefentry project='man-pages'><refentrytitle>virtiofsd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-          is instructed to map user and group ids (UIDs and GIDs). This involves mapping the private UIDs/GIDs used in the virtual machine
-          (starting with the virtual machine's root user 0 and up) to a range of UIDs/GIDs on the host that are not used for other
-          purposes (usually in the range beyond the host's UID/GID 65536).</para>
+          If enabled, <command>virtiofsd</command> is instructed to map user and group ids (UIDs and GIDs).
+          This involves mapping the private UIDs/GIDs used in the virtual machine (starting with the virtual machine's
+          root user 0 and up) to a range of UIDs/GIDs on the host that are not used for other purposes (usually in the
+          range beyond the host's UID/GID 65536).</para>
 
           <para>If one or two colon-separated numbers are specified, user namespacing is turned on. <replaceable>UID_SHIFT</replaceable>
           specifies the first host UID/GID to map, <replaceable>UID_RANGE</replaceable> is optional and specifies number of host
@@ -413,7 +413,7 @@
           <term><option>--ssh-key-type=</option><replaceable>TYPE</replaceable></term>
 
           <listitem><para>Configures the type of SSH key to generate, see
-          <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+          <citerefentry project="man-pages"><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>
           for more information.</para>
 
           <para>By default <literal>ed25519</literal> keys are generated, however <literal>rsa</literal> keys
@@ -521,7 +521,7 @@ $ systemd-vmspawn --image=image.raw
     <title>See Also</title>
     <para><simplelist type="inline">
       <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
-      <member><citerefentry><refentrytitle>mkosi</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry project='debian'><refentrytitle>mkosi</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
       <member><citerefentry><refentrytitle>importctl</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
     </simplelist></para>

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 4e9afc3674ea1b2937bd38298b9f98fcb56959af..4fba78895069dc071ccca276047ef2722e497837 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -1906,7 +1906,7 @@
         <listitem>
           <para>The Base64 encoded private key for the interface. It can be generated using
           the <command>wg genkey</command> command
-          (see <citerefentry project="wireguard"><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>).
+          (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>
           automatically imports credentials matching <literal>network.wireguard.*</literal>. For more details
@@ -1997,7 +1997,7 @@
         <term><varname>PublicKey=</varname></term>
         <listitem>
           <para>Sets a Base64 encoded public key calculated by <command>wg pubkey</command>
-          (see <citerefentry project="wireguard"><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>)
+          (see <citerefentry project='man-pages'><refentrytitle>wg</refentrytitle><manvolnum>8</manvolnum></citerefentry>)
           from a private key, and usually transmitted out of band to the author of the configuration file.
           This option honors the <literal>@</literal> prefix in the same way as the <option>PrivateKey=</option>
           setting of the <option>[WireGuard]</option> section. This option is mandatory for this section.</para>

diff --git a/mkosi.conf b/mkosi.conf
index cea204961bbd101ffe8258fe8d1472c35b923af7..96843db488149a85ac1d417cb6962b8c933aafea 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -2,7 +2,7 @@
 
 [Config]
 Images=system
-MinimumVersion=21
+MinimumVersion=23~devel
 
 [Output]
 @OutputDirectory=mkosi.output
@@ -22,7 +22,7 @@ BuildSourcesEphemeral=yes
 @RuntimeSize=8G
 ToolsTreePackages=virtiofsd
 KernelCommandLineExtra=systemd.crash_shell
-                       systemd.log_level=debug
+                       systemd.log_level=debug,console:info
                        systemd.log_ratelimit_kmsg=0
                        systemd.journald.forward_to_console
                        systemd.journald.max_level_console=warning

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 7aa64c4e0e50921aa2001b1019e50e468d7ec074..303af4acb1b345166bbb02bc7f89f809fc1ab1b9 100644 (file)
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Config]
-InitrdInclude=initrd/
-
 [Output]
 @Format=directory
 

diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
index e9aa4080da793439b3851f899b8be178fc4373c7..92d58292f4c7919a390484f720652de1d23825fd 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
@@ -4,9 +4,12 @@
 Distribution=arch
 
 [Content]
-Environment=
-        SYSTEMD_PACKAGES="systemd systemd-ukify systemd-sysvcompat systemd-resolvconf systemd-tests"
-        INITRD_PACKAGES="systemd systemd-sysvcompat"
+VolatilePackages=
+        systemd
+        systemd-ukify
+        systemd-sysvcompat
+        systemd-resolvconf
+        systemd-tests
 
 Packages=
         bpf
@@ -39,3 +42,7 @@ Packages=
 InitrdPackages=
         btrfs-progs
         tpm2-tools
+
+InitrdVolatilePackages=
+        systemd
+        systemd-sysvcompat

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
index 277d17d25ceb618f640544cee8f856547150f0ba..cc9f3e9d11ccba64d7ae0670d473b63c6704efc0 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -5,21 +5,20 @@ Distribution=|centos
 Distribution=|fedora
 
 [Content]
-Environment=
-        SYSTEMD_PACKAGES="systemd
-                          systemd-udev
-                          systemd-container
-                          systemd-repart
-                          systemd-resolved
-                          systemd-networkd
-                          systemd-boot
-                          systemd-tests
-                          systemd-ukify
-                          systemd-pam
-                          systemd-oomd-defaults
-                          systemd-journal-remote
-                          systemd-networkd-defaults"
-        INITRD_PACKAGES="systemd systemd-udev"
+VolatilePackages=
+        systemd
+        systemd-udev
+        systemd-container
+        systemd-repart
+        systemd-resolved
+        systemd-networkd
+        systemd-boot
+        systemd-tests
+        systemd-ukify
+        systemd-pam
+        systemd-oomd-defaults
+        systemd-journal-remote
+        systemd-networkd-defaults
 
 Packages=
         bpftool
@@ -57,3 +56,7 @@ Packages=
 
 InitrdPackages=
         tpm2-tools
+
+InitrdVolatilePackages=
+        systemd
+        systemd-udev

diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index b6f7fdd926b6f3b14d4d6fa59a4440b4c0f0c364..7ece67705a9ad0bd03f7c352bb71ac33e71e0ce5 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -5,22 +5,21 @@ Distribution=|debian
 Distribution=|ubuntu
 
 [Content]
-Environment=
-        SYSTEMD_PACKAGES="systemd
-                          systemd-userdbd
-                          systemd-oomd
-                          systemd-sysv
-                          systemd-tests
-                          systemd-timesyncd
-                          systemd-resolved
-                          systemd-homed
-                          systemd-coredump
-                          systemd-journal-remote
-                          systemd-container
-                          systemd-boot
-                          systemd-ukify
-                          udev"
-        INITRD_PACKAGES="systemd udev"
+VolatilePackages=
+        systemd
+        systemd-userdbd
+        systemd-oomd
+        systemd-sysv
+        systemd-tests
+        systemd-timesyncd
+        systemd-resolved
+        systemd-homed
+        systemd-coredump
+        systemd-journal-remote
+        systemd-container
+        systemd-boot
+        systemd-ukify
+        udev
 
 Packages=
         ^libasan[0-9]+$
@@ -57,3 +56,7 @@ Packages=
 InitrdPackages=
         btrfs-progs
         tpm2-tools
+
+InitrdVolatilePackages=
+        systemd
+        udev

diff --git a/mkosi.images/system/initrd/mkosi.postinst b/mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
similarity index 82%
rename from mkosi.images/system/initrd/mkosi.postinst
rename to mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
index b92bb8ae291585df6216f85104c591532b59b92a..417132f3dd0e50652d88c779fc8270ced4956fe5 100755 (executable)
--- a/mkosi.images/system/initrd/mkosi.postinst
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/initrd/mkosi.postinst
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 
-# shellcheck disable=SC2086
-mkosi-install $INITRD_PACKAGES
-
 # OpenSUSE insists on blacklisting erofs by default because its supposedly a legacy filesystem.
 # See https://github.com/openSUSE/suse-module-tools/pull/71
 rm -f "$BUILDROOT/usr/lib/modprobe.d/60-blacklist_fs-erofs.conf"

diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
index 5d04718ef5a9adfb232566bcb7919d463e2a7b01..24d69ccc277f46d8998d8331128f37dd484eae3f 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -3,19 +3,21 @@
 [Match]
 Distribution=opensuse
 
+[Config]
+InitrdInclude=initrd/
+
 [Content]
-Environment=
-        SYSTEMD_PACKAGES="systemd
-                          udev
-                          systemd-experimental
-                          systemd-boot
-                          systemd-container
-                          systemd-homed
-                          systemd-network
-                          systemd-portable
-                          systemd-sysvcompat
-                          systemd-testsuite"
-        INITRD_PACKAGES="systemd udev systemd-experimental"
+VolatilePackages=
+        systemd
+        udev
+        systemd-experimental
+        systemd-boot
+        systemd-container
+        systemd-homed
+        systemd-network
+        systemd-portable
+        systemd-sysvcompat
+        systemd-testsuite
 
 # We install gawk, gzip, grep, xz, sed, rsync and docbook-xsl-stylesheets here explicitly so that the busybox
 # versions don't get installed instead.
@@ -57,3 +59,8 @@ InitrdPackages=
         kmod
         libkmod2
         tpm2.0-tools
+
+InitrdVolatilePackages=
+        systemd
+        udev
+        systemd-experimental

diff --git a/mkosi.images/system/mkosi.postinst b/mkosi.images/system/mkosi.postinst
deleted file mode 100755 (executable)
index caaf253..0000000
--- a/mkosi.images/system/mkosi.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-set -e
-
-# shellcheck disable=SC2086
-mkosi-install $SYSTEMD_PACKAGES