From 7443382e5b1545c6a7c79daa7c410be8ffc28992 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 9 Feb 2015 10:58:53 +0100 Subject: [PATCH] Only start logind if D-BUS is installed This fixes the noisy startup failure in environments without D-BUS, such as LXC containers or servers. Part of #772700, does not yet address the auto-VT issue --- debian/changelog | 3 +++ ...y-start-logind-if-D-BUS-is-installed.patch | 24 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+) create mode 100644 debian/patches/Only-start-logind-if-D-BUS-is-installed.patch diff --git a/debian/changelog b/debian/changelog index 0cb7c8e35..ad60fad3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ systemd (218-8) UNRELEASED; urgency=medium first easily causes dependency loops. Thus during boot/shutdown operate only on the unit and not on its dependencies, just like SysV behaves. (Closes: #777115, LP: #1417010) + * Only start logind if D-BUS is installed. This fixes the noisy startup + failure in environments without D-BUS, such as LXC containers or servers. + (part of #772700, does not yet address the auto-VT issue) -- Martin Pitt Sun, 01 Feb 2015 22:42:30 +0100 diff --git a/debian/patches/Only-start-logind-if-D-BUS-is-installed.patch b/debian/patches/Only-start-logind-if-D-BUS-is-installed.patch new file mode 100644 index 000000000..4b1131b35 --- /dev/null +++ b/debian/patches/Only-start-logind-if-D-BUS-is-installed.patch @@ -0,0 +1,24 @@ +From: Martin Pitt +Date: Mon, 9 Feb 2015 10:53:43 +0100 +Subject: Only start logind if D-BUS is installed + +logind fails to start in environments without D-BUS, such as LXC containers or +servers. Add a startup condition to avoid the very noisy startup failure. + +Part of #772700 +--- + units/systemd-logind.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in +index f087e99..860cb25 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 + + # Ask for the dbus socket. If running over kdbus, the socket will + # not be actually used. diff --git a/debian/patches/series b/debian/patches/series index 8af03d896..e554bf8a7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -65,3 +65,4 @@ Accept-mountall-specific-fstab-options.patch Fix-usr-remount-failure-for-split-usr.patch util-Add-hidden-suffixes-for-ucf.patch Drop-rc-local-generator.patch +Only-start-logind-if-D-BUS-is-installed.patch -- 2.39.5