systemd: enable the dbus service unconditionally

Since D-Bus is a core part of the OS don't make this service optional.

diff --git a/bus/Makefile.am b/bus/Makefile.am
index a5889ff1607e16af91c96c0baa605f8d02b48dd3..5c4fb15bc9fe4768189d44b3ead30b2ea0a2d02e 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -223,6 +223,11 @@ if HAVE_SYSTEMD
 # Install dbus.socket as default implementation of a D-Bus stack
        $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants
        $(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/dbus.target.wants/dbus.socket
+# Unconditionally enable D-Bus on systemd installations
+       $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
+       $(LN_S) ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket
+       $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants
+       $(LN_S) ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
 endif
 
 #### Init scripts fun

diff --git a/bus/dbus.service.in b/bus/dbus.service.in
index 173fcd6199ea217f81119b474dbab780df1813e2..399306f64e47834bdec97fa26e6dff35c453791f 100644 (file)
--- a/bus/dbus.service.in
+++ b/bus/dbus.service.in
@@ -8,7 +8,3 @@ ExecStartPre=@EXPANDED_BINDIR@/dbus-uuidgen --ensure
 ExecStartPre=-/bin/rm -f @DBUS_SYSTEM_PID_FILE@
 ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --systemd-activation
 ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
-
-[Install]
-WantedBy=multi-user.target
-Also=dbus.socket

diff --git a/bus/dbus.socket.in b/bus/dbus.socket.in
index a4bb5f2c6879ae595fc1622163388f2b7505618b..74cbe582b3e26eeebe9312432b5e8f58520e8a65 100644 (file)
--- a/bus/dbus.socket.in
+++ b/bus/dbus.socket.in
@@ -3,6 +3,3 @@ Description=D-Bus System Message Bus Socket
 
 [Socket]
 ListenStream=@DBUS_SYSTEM_SOCKET@
-
-[Install]
-WantedBy=sockets.target

diff --git a/configure.in b/configure.in
index 8a7dc6f3886c7b52ea1b2e2ea3e78098a484b01f..2d6e3ccf79f9cc7d903a0c392a903d8dc749f593 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1388,8 +1388,10 @@ AM_CONDITIONAL(DBUS_INIT_SCRIPTS_CYGWIN, test x$with_init_scripts = xcygwin)
 AC_ARG_WITH([systemdsystemunitdir],
 AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
         [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+if test "x$with_systemdsystemunitdir" != xno; then
+   AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
 
 ##### Set up location for system bus socket
 if ! test -z "$with_system_socket"; then