daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 6f755a0934a1806a187076f9757064d3e973d1d2 Mon Sep 17 00:00:00 2001
803fb7
From: Benjamin Robin <dev@benjarobin.fr>
803fb7
Date: Sat, 19 Sep 2015 21:57:51 +0200
803fb7
Subject: [PATCH] systemd-notify: Always pass a valid pid to sd_pid_notify
803fb7
803fb7
If the option --pid was used, take the pid from this option, unless take
803fb7
the parend pid. Using 0 as pid (ucred of systemd-notify) will result 99% of the
803fb7
time in a failure with this error: "Cannot find unit for notify message of PID"
803fb7
803fb7
Shouldn't we use always the ppid, since the MAINPID is something else ?
803fb7
803fb7
Signed-off-by: Benjamin Robin <dev@benjarobin.fr>
803fb7
803fb7
Cherry-picked from: 9de009a9
803fb7
Resolves: #1381743
803fb7
---
803fb7
 src/notify/notify.c | 2 +-
803fb7
 1 file changed, 1 insertion(+), 1 deletion(-)
803fb7
803fb7
diff --git a/src/notify/notify.c b/src/notify/notify.c
803fb7
index c89a6cc06..0d382992a 100644
803fb7
--- a/src/notify/notify.c
803fb7
+++ b/src/notify/notify.c
803fb7
@@ -209,7 +209,7 @@ int main(int argc, char* argv[]) {
803fb7
                 goto finish;
803fb7
         }
803fb7
 
803fb7
-        r = sd_pid_notify(arg_pid, false, n);
803fb7
+        r = sd_pid_notify(arg_pid ? arg_pid : getppid(), false, n);
803fb7
         if (r < 0) {
803fb7
                 log_error_errno(r, "Failed to notify init system: %m");
803fb7
                 goto finish;