dbus-daemon: Don't create /tmp/dbus_launch

VD only uses /tmp/dbus_launch
- VD target: use /tmp/dbus_launch generated by systemd in kdbus
- VD emulator: use /tmp/dbus_launch generated by dbus-daemon that uses VD plugin drop-in

Change-Id: If2120a016015ee76c589416dab7cc6c96ee21b05

diff --git a/bus/dbus.service.in b/bus/dbus.service.in
index 7840e61..b3b7167 100644 (file)
--- a/bus/dbus.service.in
+++ b/bus/dbus.service.in
@@ -5,12 +5,10 @@ DefaultDependencies=no
 Requires=dbus.socket
 Wants=security-manager.socket
 After=security-manager.socket
-#dbus-daemon creates /tmp/dbus_launch
-RequiresMountsFor=/tmp
 
 [Service]
 Type=notify
-ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --systemd-activation
+ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation
 ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
 OOMScoreAdjust=-900
 User=dbus

diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index 7705c96..4f97865 100644 (file)
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -139,7 +139,6 @@ export V=1
 %endif
     --enable-kdbus-transport                                            \
     --enable-libdbuspolicy                                             \
-    --with-system-pid-file=/tmp/dbus_launch                            \
     --with-console-auth-dir=/var/run/dbus/at_console/                  \
     --with-systemdsystemunitdir=%{_unitdir}                            \
     --with-systemduserunitdir=%{_unitdir_user}                          \
@@ -177,7 +176,6 @@ popd
 %endif
     --enable-kdbus-transport                                            \
     --enable-libdbuspolicy                                             \
-    --with-system-pid-file=/tmp/dbus_launch                            \
     --with-console-auth-dir=/var/run/dbus/at_console/                  \
     --with-systemdsystemunitdir=%{_unitdir}                            \
     --with-systemduserunitdir=%{_unitdir_user}                          \
@@ -208,7 +206,6 @@ find dbus -name '*.gcno' -exec cp '{}' coverage-objects ';'
 %if %{with_systemd}
     --enable-systemd                                                   \
 %endif
-    --with-system-pid-file=/tmp/dbus_launch                            \
     --with-console-auth-dir=/var/run/dbus/at_console/                  \
     --with-systemdsystemunitdir=%{_unitdir}                            \
     --with-systemduserunitdir=%{_unitdir_user}                          \