mkosi: Update to latest

We modify all our scripts to execute in the image instead of on the
hosts. In the future we can adapt them to run on the host.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 13da4e40734783015b1dda3a0ac7f4516a6c70b1..2d0c9de742b4aea4112a32e1770afcf0b77232f0 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -76,7 +76,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-    - uses: systemd/mkosi@c6dd95b6eae0386579071cbf44fd838ce28b7237
+    - uses: systemd/mkosi@1c09cb53e5f3fdb35919d525e8c3e6132344ae98
 
     - name: Configure
       run: |

diff --git a/mkosi.presets/00-base/mkosi.build b/mkosi.presets/00-base/mkosi.build
index da2b600faea0f5e6f94d56d85b63507aea4a28a9..f3de7bc6f525c3e6f4c550b2f1e6071a809d7064 100755 (executable)
--- a/mkosi.presets/00-base/mkosi.build
+++ b/mkosi.presets/00-base/mkosi.build
@@ -5,6 +5,10 @@ set -e
 # This is a build script for OS image generation using mkosi (https://github.com/systemd/mkosi).
 # Simply invoke "mkosi" in the project directory to build an OS image.
 
+if [ "${container:-}" != "mkosi" ]; then
+    exec mkosi-chroot "$SCRIPT" "$@"
+fi
+
 # If mkosi.builddir/ exists mkosi will set $BUILDDIR to it, let's then use it
 # as out-of-tree build dir. Otherwise, let's make up our own builddir.
 [ -z "$BUILDDIR" ] && BUILDDIR="$PWD"/build

diff --git a/mkosi.presets/10-initrd/mkosi.postinst b/mkosi.presets/10-initrd/mkosi.postinst
index 79cce3002292d500fe8f722a3feb3b68fcffdf20..6782ddd5faf9e3223983bf0a68f0451f43447c58 100755 (executable)
--- a/mkosi.presets/10-initrd/mkosi.postinst
+++ b/mkosi.presets/10-initrd/mkosi.postinst
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 
+if [ "${container:-}" != "mkosi" ]; then
+    exec mkosi-chroot "$SCRIPT" "$@"
+fi
+
 # 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 /usr/lib/modprobe.d/60-blacklist_fs-erofs.conf

diff --git a/mkosi.presets/20-final/mkosi.kernel.build b/mkosi.presets/20-final/mkosi.kernel.build
index c99d365d8b6848aa464ba68d250e7f9ea0240bf2..64cc48863fd03902437aab3790b824e87f9c7da6 100755 (executable)
--- a/mkosi.presets/20-final/mkosi.kernel.build
+++ b/mkosi.presets/20-final/mkosi.kernel.build
@@ -2,6 +2,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -e
 
+if [ "${container:-}" != "mkosi" ]; then
+    exec mkosi-chroot "$SCRIPT" "$@"
+fi
+
 if [ -d "$SRCDIR"/mkosi.kernel/ ]; then
     SRCDIR="$SRCDIR/mkosi.kernel"
     BUILDDIR="$BUILDDIR/mkosi.kernel"

diff --git a/mkosi.presets/20-final/mkosi.postinst b/mkosi.presets/20-final/mkosi.postinst
index b9a26c3163859b3b924202415544c852f25a621d..2fd45361376436f1bef387d0350692af96121b3e 100755 (executable)
--- a/mkosi.presets/20-final/mkosi.postinst
+++ b/mkosi.presets/20-final/mkosi.postinst
@@ -6,6 +6,10 @@ if [ "$1" = "build" ]; then
     exit 0
 fi
 
+if [ "${container:-}" != "mkosi" ]; then
+    exec mkosi-chroot "$SCRIPT" "$@"
+fi
+
 if [ -n "$SANITIZERS" ]; then
     LD_PRELOAD=$(ldd /usr/lib/systemd/systemd | grep libasan.so | awk '{print $3}')