From: Tom Gundersen <teg@jklm.no>
Date: Tue, 2 Jun 2015 21:08:11 +0000 (+0200)
Subject: udevd: make sd_notify independent of forknig/notify mode
X-Git-Tag: v221~203^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7500cd5e96cff52a726d03194e3b927771ddb1d4;p=thirdparty%2Fsystemd.git

udevd: make sd_notify independent of forknig/notify mode

This will simply silently fail on non-systemd systems, so there is no reason
to make it conditional.

Also make it clear that we notify systemd about being ready as the last step
before starting the event loop, whereas the forking might need to happen
earlier.
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index a6cddf6e5a4..5fee67d8df1 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1716,15 +1716,16 @@ int main(int argc, char *argv[]) {
                 setsid();
 
                 write_string_file("/proc/self/oom_score_adj", "-1000");
-        } else
-                sd_notify(false,
-                          "READY=1\n"
-                          "STATUS=Processing...");
+        }
 
         r = manager_listen(manager);
         if (r < 0)
                 return log_error_errno(r, "failed to set up fds and listen for events: %m");
 
+        (void) sd_notify(false,
+                         "READY=1\n"
+                         "STATUS=Processing...");
+
         r = sd_event_loop(manager->event);
         if (r < 0) {
                 log_error_errno(r, "event loop failed: %m");