From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 27 Nov 2017 15:58:46 +0000 (+0100)
Subject: service: shortcut operations if the MAINPID= doesn't actually cause a change
X-Git-Tag: v236~105^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7316%2Fhead;p=thirdparty%2Fsystemd.git

service: shortcut operations if the MAINPID= doesn't actually cause a change
---

diff --git a/src/core/service.c b/src/core/service.c
index e7e65d4270a..e7a829a564f 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -3386,7 +3386,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags, FDSet *fds)
                         log_unit_warning(u, "A control process cannot also be the main process");
                 else if (pid == getpid_cached() || pid == 1)
                         log_unit_warning(u, "Service manager can't be main process, ignoring sd_notify() MAINPID= field");
-                else {
+                else if (pid != s->main_pid) {
                         service_set_main_pid(s, pid);
                         unit_watch_pid(UNIT(s), pid);
                         notify_dbus = true;