service: remove pidfile after exit of a service

diff --git a/TODO b/TODO
index b83fd67b8642bae0b317be4801fa43315668866d..59e0f979e11d641dc3413e5c0083d69af0f070b8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -60,8 +60,6 @@ Features:
 
 * better error message if you run systemctl without systemd running
 
-* unlink PID files of units after exit
-
 * tiny tool that saves/restores backlight
 
 * systemctl status output should should include list of triggering units and their status

diff --git a/src/core/service.c b/src/core/service.c
index 4070fd741bf0f8dfa926fc0b4de5571b7aae02c2..34dde7963e6fdd6d53b375ce37e1953f8004be82 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1957,6 +1957,12 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
         /* we want fresh tmpdirs in case service is started again immediately */
         exec_context_tmp_dirs_done(&s->exec_context);
 
+        /* Try to delete the pid file. At this point it will be
+         * out-of-date, and some software might be confused by it, so
+         * let's remove it. */
+        if (s->pid_file)
+                unlink_noerrno(s->pid_file);
+
         return;
 
 fail: