From: Simon McVittie Date: Sat, 7 Nov 2015 12:06:52 +0000 (+0100) Subject: Stop statically enabling dbus.socket in dbus.target X-Git-Tag: dbus-1.11.0~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3670e9279f56bbc15f33adbd0086e059b184f8a;p=thirdparty%2Fdbus.git Stop statically enabling dbus.socket in dbus.target dbus.target was relevant in early versions of systemd, but is not used or installed any more. We also enable the socket in sockets.target, which is the right place to do this sort of thing. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=78412 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757913 Signed-off-by: Simon McVittie Reviewed-by: Lennart Poettering --- diff --git a/bus/Makefile.am b/bus/Makefile.am index 33af09b0e..90092b142 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -249,8 +249,6 @@ if HAVE_SYSTEMD # Install dbus.socket as default implementation of a D-Bus stack. # Deliberately not using $(LN_S) here: ln -fs is not universally portable, # but neither is systemd, so it's OK to assume here that ln complies with SUS. - $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants - ln -fs ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket # Unconditionally enable D-Bus on systemd installations $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants ln -fs ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket