From 86b9870e4533b91038deb38de2adfd70399213a4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 2 Feb 2012 02:25:11 +0100 Subject: [PATCH 2/2] systemd: don't remove PID file explicitly in unit file Since version 21 systemd does not support operating systems without /run anymore. Since /run has to be a tmpfs it is cleaned up implicitly during boot, explicitly deleting the D-Bus PID file before running D-Bus is hence entirely redundant and getting rid of it saves us a bit of boot time. --- bus/dbus.service.in | 1 - configure.ac | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/bus/dbus.service.in b/bus/dbus.service.in index 8ab067f..22924ae 100644 --- a/bus/dbus.service.in +++ b/bus/dbus.service.in @@ -4,7 +4,6 @@ Requires=dbus.socket After=syslog.target [Service] -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 OOMScoreAdjust=-900 diff --git a/configure.ac b/configure.ac index 3ca922b..e4a04c2 100644 --- a/configure.ac +++ b/configure.ac @@ -1416,7 +1416,7 @@ AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), [], [ - PKG_CHECK_EXISTS([systemd], + PKG_CHECK_EXISTS([systemd >= 21], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)], [with_systemdsystemunitdir=no]) ]) -- 1.7.7.4