Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core20] Add dbus system bus #178

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Maintainer: Dimitri John Ledkov <[email protected]>
Build-Depends: debhelper-compat (= 12), dh-python, python3:any, dracut-core, quilt, busybox-initramfs,
util-linux,
e2fsprogs,
dbus,
dosfstools,
dmsetup,
mount,
Expand Down
6 changes: 5 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions factory/usr/lib/systemd/system/the-tool.service
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down