From 5739271000b7faa72dfa3aa8005bbaf4d1869f80 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 15 Apr 2023 09:34:46 +0200 Subject: [PATCH] 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. --- .github/workflows/mkosi.yml | 2 +- mkosi.conf.d/20-debian.conf | 2 +- mkosi.conf.d/20-ubuntu.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index e42f304115..4e77af75d7 100644 --- 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 9e61b53eba..61a86310e4 100644 --- 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 132f72a8d3..11c2721877 100644 --- 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 -- 2.25.1