Merge pull request #27977 from DaanDeMeyer/update-mkosi

Update mkosi

.github/workflows/mkosi.yml

@@ -76,7 +76,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
-    - uses: systemd/mkosi@8fde39857993c2120bcc6e480dab9fbb47dc2a7e
+    - uses: systemd/mkosi@87a6b70ea9ab529b95fc91306fc8151175999dca
 
     - name: Configure
       run: |
@@ -121,11 +121,7 @@ jobs:
       run: mkosi --debug
 
     - name: Boot ${{ matrix.distro }} systemd-nspawn
-      run: sudo mkosi --debug boot
+      run: test "$(sudo mkosi --debug boot 1>&2; echo $?)" -eq 123
 
     - name: Boot ${{ matrix.distro }} QEMU
-      run: timeout -k 30 10m mkosi --debug qemu
-
-    # vsock in Github Actions with qemu is broken so for now we check for failures manually.
-    - name: Check ${{ matrix.distro }} QEMU
-      run: sudo mkosi shell bash -c "[[ -e /testok ]] || { cat /failed-services; exit 1; }"
+      run: timeout -k 30 10m test "$(mkosi --debug qemu 1>&2; echo $?)" -eq 123

mkosi.conf.d/11-centos-8/mkosi.conf

@@ -3,3 +3,6 @@
 [Match]
 Distribution=centos
 Release=8
+
+[Distribution]
+PackageManagerTrees=mkosi.reposdir:/etc/yum.repos.d

mkosi.kernel.config

@@ -51,6 +51,7 @@ CONFIG_EFI_MIXED=y
 CONFIG_EFI_STUB=y
 CONFIG_EFI_ZBOOT=y
 CONFIG_EFI=y
+CONFIG_EROFS_FS=y
 CONFIG_EXPERT=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
@@ -98,6 +99,7 @@ CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_ISO9660_FS=y
 CONFIG_KEXEC=y
 CONFIG_KPROBES=y
+CONFIG_KSM=y
 CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_MAC80211=y
 CONFIG_MAGIC_SYSRQ=y
@@ -202,7 +204,6 @@ CONFIG_X86_MSR=y
 CONFIG_XFRM_USER=y
 CONFIG_XFS_FS=y
 CONFIG_XFS_POSIX_ACL=y
-CONFIG_KSM=y
 
 # CONFIG_WIRELESS is not set
 # CONFIG_WLAN is not set

mkosi.presets/20-final/mkosi.conf

@@ -26,6 +26,7 @@ Packages=
         openssl
         qrencode
         sed
+        socat
         strace
         tmux
         tree

mkosi.presets/20-final/mkosi.conf.d/10-arch.conf

@@ -5,6 +5,7 @@ Distribution=arch
 
 [Content]
 Packages=
+        bpf
         btrfs-progs
         compsize
         dhcp

mkosi.presets/20-final/mkosi.conf.d/10-centos-fedora.conf

@@ -6,6 +6,7 @@ Distribution=|fedora
 
 [Content]
 Packages=
+        bpftool
         cryptsetup
         dhcp-server
         dnf

mkosi.presets/20-final/mkosi.conf.d/10-debian.conf

@@ -5,4 +5,5 @@ Distribution=debian
 
 [Content]
 Packages=
+        bpftool
         linux-image-cloud-amd64

mkosi.presets/20-final/mkosi.conf.d/10-opensuse.conf

@@ -5,6 +5,7 @@ Distribution=opensuse
 
 [Content]
 Packages=
+        bpftool
         btrfs-progs
         cryptsetup
         dbus-broker

mkosi.presets/20-final/mkosi.conf.d/10-ubuntu.conf

@@ -8,3 +8,5 @@ Packages=
         # We would like to use linux-image-kvm but it does not have support for dm-verity
         # See https://bugs.launchpad.net/ubuntu/+source/linux-meta-kvm/+bug/2019040.
         linux-image-generic
+        linux-tools-common
+        linux-tools-generic

mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/mkosi-check-and-shutdown.sh

@@ -1,8 +1,6 @@
 #!/bin/bash -eux
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-rm -f /testok
-
 # TODO: Figure out why this is failing
 systemctl reset-failed systemd-vconsole-setup.service
 
@@ -20,4 +18,6 @@ fi
 # Exit with non-zero EC if the /failed-services file is not empty (we have -e set)
 [[ ! -s /failed-services ]]
 
-touch /testok
+# On success, exit with 123 so that we can check that we receive the actual exit code from the script on the
+# host.
+exit 123