summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bus/dbus.service.in4
-rw-r--r--packaging/dbus.spec3
2 files changed, 1 insertions, 6 deletions
diff --git a/bus/dbus.service.in b/bus/dbus.service.in
index 7840e61c..b3b7167f 100644
--- 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 7705c96c..4f97865b 100644
--- 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} \