system-config: enable dbus in system- and user- presets

It is no longer enabled by default by systemd package. QubesOS/qubes-issues#4225
QubesOS · Apr 1, 2019 · d705fa6 · d705fa6
1 parent 61ec339
commit d705fa6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/rpm_spec/core-dom0-linux.spec.in b/rpm_spec/core-dom0-linux.spec.in
@@ -136,6 +136,8 @@ install -m 755 -D system-config/kernel-xen-efi.install $RPM_BUILD_ROOT/usr/lib/k
 install -m 755 -D system-config/kernel-remove-bls.install $RPM_BUILD_ROOT/usr/lib/kernel/install.d/99-remove-bls.install
 install -m 644 -D system-config/75-qubes-dom0.preset \
     $RPM_BUILD_ROOT/usr/lib/systemd/system-preset/75-qubes-dom0.preset
+install -m 644 -D system-config/75-qubes-dom0-user.preset \
+    $RPM_BUILD_ROOT/usr/lib/systemd/user-preset/75-qubes-dom0-user.preset
 install -m 644 -D system-config/99-qubes-default-disable.preset \
     $RPM_BUILD_ROOT/usr/lib/systemd/system-preset/99-qubes-default-disable.preset
 install -d $RPM_BUILD_ROOT/etc/dnf/protected.d
@@ -239,6 +241,7 @@ chmod -x /etc/grub.d/10_linux
 %config(noreplace) /etc/dnf/protected.d/qubes-core-dom0.conf
 /usr/lib/systemd/system-preset/75-qubes-dom0.preset
 /usr/lib/systemd/system-preset/99-qubes-default-disable.preset
+/usr/lib/systemd/user-preset/75-qubes-dom0-user.preset
 /var/lib/qubes/.qubes-exclude-block-devices
 # Man
 %{_mandir}/man1/qvm-*.1*

diff --git a/system-config/75-qubes-dom0-user.preset b/system-config/75-qubes-dom0-user.preset
@@ -0,0 +1,2 @@
+enable dbus.socket
+enable dbus-daemon.service
diff --git a/system-config/75-qubes-dom0.preset b/system-config/75-qubes-dom0.preset
@@ -18,6 +18,8 @@ enable dm-event.*
 enable dmraid-activation.service
 enable fstrim.timer
 
+enable dbus.socket
+enable dbus-daemon.service
 
 enable abrtd.service
 enable abrt-ccpp.service