From f8ae83a11b9b3f29ac088745fc589a0ca4a6a688 Mon Sep 17 00:00:00 2001 From: Valentin David Date: Tue, 2 May 2023 14:19:18 +0200 Subject: [PATCH] Add dbus system bus D-Bus system bus is needed by `systemd-run --wait`. --- debian/control | 1 + debian/rules | 6 +++++- factory/usr/lib/systemd/system/the-tool.service | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 89b0cc3c..30051b01 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Dimitri John Ledkov Build-Depends: debhelper-compat (= 12), dh-python, python3:any, dracut-core, quilt, busybox-initramfs, util-linux, e2fsprogs, + dbus, dosfstools, dmsetup, mount, diff --git a/debian/rules b/debian/rules index 5f8ac9c8..fa7270da 100755 --- a/debian/rules +++ b/debian/rules @@ -134,6 +134,8 @@ INSTALL_FILES_FROM_HOST= \ /lib/$(DEB_HOST_MULTIARCH)/libgcc_s.so.1 \ /lib/$(DEB_HOST_MULTIARCH)/libnss_compat.so.* \ /lib/$(DEB_HOST_MULTIARCH)/libnss_files.so.* \ + /lib/systemd/system/dbus.service \ + /lib/systemd/system/dbus.socket \ /lib/systemd/system/snapd.recovery-chooser-trigger.service \ /lib/systemd/systemd-bootchart \ /sbin/cryptsetup \ @@ -144,10 +146,12 @@ INSTALL_FILES_FROM_HOST= \ /sbin/mkfs.ext4 \ /sbin/mkfs.vfat \ /sbin/sfdisk \ + /usr/bin/dbus-daemon \ /usr/bin/partx \ /usr/bin/unsquashfs \ /usr/lib/snapd/info \ - /usr/lib/snapd/snap-bootstrap + /usr/lib/snapd/snap-bootstrap \ + /usr/share/dbus-1/system.conf override_dh_auto_install: TEMPLIBDIR := $(shell mktemp -d) override_dh_auto_install: diff --git a/factory/usr/lib/systemd/system/the-tool.service b/factory/usr/lib/systemd/system/the-tool.service index 036548d6..654d0007 100644 --- a/factory/usr/lib/systemd/system/the-tool.service +++ b/factory/usr/lib/systemd/system/the-tool.service @@ -8,6 +8,9 @@ Wants=systemd-modules-load.service After=systemd-udev-settle.service Wants=systemd-udev-settle.service +Wants=dbus.socket +After=dbus.socket + [Service] Type=oneshot RemainAfterExit=true