mkosi: Update to latest

mkosi now installs a "ignore *" default preset on Debian. We also
switch Debian to dbus-broker now that preset doesn't disable it
anymore.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index e42f304115d086beacdf208fa5ac3709683258cc..4e77af75d72cea1c310f8e828d3f2d5634ff098b 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -73,7 +73,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
-    - uses: systemd/mkosi@779484101987048b820b07a6111bcb0e8d5ebc1d
+    - uses: systemd/mkosi@268a9374d5a93a4021db6521a39db2c2ed9fd755
 
     - name: Configure
       run: |

diff --git a/mkosi.conf.d/20-debian.conf b/mkosi.conf.d/20-debian.conf
index 9e61b53eba673e3e5e2798a3f9845ad2dc7ae3aa..61a86310e48b6891b8537c0d6c8724199d527ed0 100644 (file)
--- a/mkosi.conf.d/20-debian.conf
+++ b/mkosi.conf.d/20-debian.conf
@@ -10,7 +10,7 @@ Release=testing
 Packages=
         btrfs-progs
         cryptsetup-bin
-        dbus
+        dbus-broker
         default-dbus-session-bus
         f2fs-tools
         fdisk

diff --git a/mkosi.conf.d/20-ubuntu.conf b/mkosi.conf.d/20-ubuntu.conf
index 132f72a8d34ee630efe2467129cdc5b2fa05d1df..11c2721877d1c4344eaaa87223f9fa752de900fa 100644 (file)
--- a/mkosi.conf.d/20-ubuntu.conf
+++ b/mkosi.conf.d/20-ubuntu.conf
@@ -11,7 +11,7 @@ Repositories=universe
 Packages=
         btrfs-progs
         cryptsetup-bin
-        dbus
+        dbus-broker
         default-dbus-session-bus
         f2fs-tools
         fdisk