From ea6376d17f4475d470925adfe7bf1bac577e96b2 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Wed, 26 Jun 2024 15:21:14 +0100
Subject: [PATCH 1/3] mkosi: bump to latest commit

---
 .github/workflows/mkosi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 3a8dabd95c7..1b2f77c5595 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -92,7 +92,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
-    - uses: systemd/mkosi@6972f9efba5c8472d990be3783b7e7dbf76e109e
+    - uses: systemd/mkosi@70aa901697f12182ccaa24e2325867d275479b55
 
     # 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

From efd5314c5036cc41f3dde0e2ef33c3cbd4314e3f Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Wed, 26 Jun 2024 15:21:33 +0100
Subject: [PATCH 2/3] mkosi: use new standalone-shutdown package for debian's
 exitrd

---
 mkosi.images/exitrd/mkosi.conf.d/10-debian.conf           | 8 ++++++++
 .../{10-debian-ubuntu.conf => 10-ubuntu.conf}             | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 mkosi.images/exitrd/mkosi.conf.d/10-debian.conf
 rename mkosi.images/exitrd/mkosi.conf.d/{10-debian-ubuntu.conf => 10-ubuntu.conf} (68%)

diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-debian.conf b/mkosi.images/exitrd/mkosi.conf.d/10-debian.conf
new file mode 100644
index 00000000000..68b0aa5fe7f
--- /dev/null
+++ b/mkosi.images/exitrd/mkosi.conf.d/10-debian.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=debian
+
+[Content]
+Packages=
+        systemd-standalone-shutdown
diff --git a/mkosi.images/exitrd/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf
similarity index 68%
rename from mkosi.images/exitrd/mkosi.conf.d/10-debian-ubuntu.conf
rename to mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf
index babde60c9fc..ddd68dc1b4b 100644
--- a/mkosi.images/exitrd/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi.images/exitrd/mkosi.conf.d/10-ubuntu.conf
@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=|debian
-Distribution=|ubuntu
+Distribution=ubuntu
 
 [Content]
 Packages=

From 582718d959c66e3e7108310662ec8ae587ae6862 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Wed, 26 Jun 2024 15:52:23 +0100
Subject: [PATCH 3/3] mkosi: switch opensuse to devel branch

The factory branch seems to have been reset to 9 years ago, switch
to devel
---
 mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 38ae0524a12..9d9566d905a 100644
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -9,8 +9,8 @@ InitrdInclude=initrd/
 [Content]
 Environment=
         GIT_URL=https://src.opensuse.org/rpm/systemd
-        GIT_BRANCH=factory
-        GIT_COMMIT=973534fe1a0a5746ead5bbb6dff8b9ccb9e010982997ed56eba8e44a41c5895d
+        GIT_BRANCH=devel
+        GIT_COMMIT=23bfa9d83b6e24a5395a704b816a351f3dc5b5316e580cacedd1b5d9e068c117
 
 VolatilePackages=
         systemd