From 410a1a018dee6381bb7b6791126c4ce5c58541d0 Mon Sep 17 00:00:00 2001
From: Hyotaek Shim <hyotaek.shim@samsung.com>
Date: Mon, 25 Jun 2018 16:29:21 +0900
Subject: Boost dbus.service and dbus.socket for boot optimization

Change-Id: Ie47ca8ea5fbf3b1deee98ebcdcd644b021531713
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
---
 bus/Makefile.am                  | 2 --
 bus/dbus.service.in              | 1 +
 bus/dbus.socket.in               | 1 +
 bus/systemd-user/dbus.service.in | 2 +-
 bus/systemd-user/dbus.socket.in  | 2 +-
 packaging/dbus.spec              | 7 -------
 6 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 9e688cff..5f28a25f 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -260,8 +260,6 @@ if HAVE_SYSTEMD
 # Unconditionally enable D-Bus on systemd installations
 	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
 	ln -fs ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket
-	$(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants
-	ln -fs ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service
 endif
 if DBUS_ENABLE_USER_SESSION
 	$(mkinstalldirs) $(DESTDIR)$(systemduserunitdir)/sockets.target.wants
diff --git a/bus/dbus.service.in b/bus/dbus.service.in
index 126601ba..37659445 100644
--- a/bus/dbus.service.in
+++ b/bus/dbus.service.in
@@ -1,6 +1,7 @@
 [Unit]
 Description=D-Bus System Message Bus
 Documentation=man:dbus-daemon(1)
+DefaultDependencies=no
 Requires=dbus.socket
 
 [Service]
diff --git a/bus/dbus.socket.in b/bus/dbus.socket.in
index b375558c..d55ce278 100644
--- a/bus/dbus.socket.in
+++ b/bus/dbus.socket.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=D-Bus System Message Bus Socket
+DefaultDependencies=no
 
 [Socket]
 SmackLabelIPIn=*
diff --git a/bus/systemd-user/dbus.service.in b/bus/systemd-user/dbus.service.in
index 368d1219..6af9c19b 100644
--- a/bus/systemd-user/dbus.service.in
+++ b/bus/systemd-user/dbus.service.in
@@ -1,8 +1,8 @@
 [Unit]
 Description=D-Bus User Message Bus
 Documentation=man:dbus-daemon(1)
-Requires=dbus.socket
 DefaultDependencies=no
+Requires=dbus.socket
 
 [Service]
 ExecStart=@EXPANDED_BINDIR@/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation
diff --git a/bus/systemd-user/dbus.socket.in b/bus/systemd-user/dbus.socket.in
index 77958f7c..0028e0a7 100644
--- a/bus/systemd-user/dbus.socket.in
+++ b/bus/systemd-user/dbus.socket.in
@@ -1,9 +1,9 @@
 [Unit]
 Description=D-Bus User Message Bus Socket
+DefaultDependencies=no
 
 [Socket]
 ListenStream=%t/bus
 
 [Install]
-WantedBy=sockets.target
 Also=dbus.service
diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index 0478d4cf..53ad811a 100644
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -240,9 +240,6 @@ chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c d
 install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
 install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d
 
-mkdir -p %{buildroot}%{_unitdir_user}/basic.target.wants
-ln -sf ../dbus.service %{buildroot}%{_unitdir_user}/basic.target.wants/dbus.service
-
 rm -rf %{buildroot}/%{_libdir}/*.la
 rm -rf %{buildroot}/%{_bindir}/dbus-launch
 
@@ -328,8 +325,6 @@ popd
 %{_unitdir}/dbus.service
 %dir %{_unitdir}/sockets.target.wants
 %{_unitdir}/sockets.target.wants/dbus.socket
-%dir %{_unitdir}/multi-user.target.wants
-%{_unitdir}/multi-user.target.wants/dbus.service
 %dir %{_unitdir}/dbus.target.wants
 %{_unitdir}/dbus.target.wants/dbus.socket
 %dir %{_unitdir_user}
@@ -337,8 +332,6 @@ popd
 %{_unitdir_user}/dbus.service
 %dir %{_unitdir_user}/sockets.target.wants
 %{_unitdir_user}/sockets.target.wants/dbus.socket
-%dir %{_unitdir_user}/basic.target.wants
-%{_unitdir_user}/basic.target.wants/dbus.service
 %dir %{_sysconfdir}/dbus-1
 %dir %{_datadir}/dbus-1/session.d
 %dir %{_datadir}/dbus-1/system.d
-- 
cgit v1.2.3