Commit 0d601f8e authored by Michael Biebl's avatar Michael Biebl

Sync changes with experimental regarding the logind patch

parent e0b3ce3b
......@@ -11,14 +11,14 @@ Part of #772700
1 file changed, 1 insertion(+)
diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in
index c6cbd1c..ef68aa0 100644
index f087e99..07f65c4 100644
--- a/units/systemd-logind.service.in
+++ b/units/systemd-logind.service.in
@@ -12,6 +12,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/logind
Documentation=http://www.freedesktop.org/wiki/Software/systemd/multiseat
Wants=user.slice
After=nss-user-lookup.target user.slice
+ConditionFileIsExecutable=/usr/bin/dbus-daemon
+ConditionPathExists=/lib/systemd/system/dbus.service
# Ask for the dbus socket. If running over kdbus, the socket will
# not be actually used.
......@@ -182,6 +182,6 @@ udev-re-enable-mount-propagation-for-udevd.patch
Add-env-variable-for-machine-ID-path.patch
Prefer-etc-X11-default-display-manager-if-present.patch
Fix-usr-remount-failure-for-split-usr.patch
Only-start-logind-if-D-BUS-is-installed.patch
Only-start-logind-if-dbus-is-installed.patch
cgroup-don-t-trim-cgroup-trees-created-by-someone-el.patch
core-don-t-fail-to-run-services-in-user-instances-if.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment