From: Tom Gundersen <teg@jklm.no>
Date: Fri, 29 May 2015 16:31:01 +0000 (+0200)
Subject: udevd: modernize status notification
X-Git-Tag: v221~254
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cbb20578b4cc239b049d4901fdac42640f4879e;p=thirdparty%2Fsystemd.git

udevd: modernize status notification

Only log about starting in daemon mode, rely on PID1 to log this in notify mode. Also
explicitly set the STATUS variable, as is done in notify mode as is done for other
serivecs.
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index dbfe5f940fa..5bfeefdf7df 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1658,8 +1658,6 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 goto exit;
 
-        log_info("starting version " VERSION);
-
         r = udev_rules_apply_static_dev_perms(manager->rules);
         if (r < 0)
                 log_error_errno(r, "failed to apply permissions on static device nodes: %m");
@@ -1667,6 +1665,8 @@ int main(int argc, char *argv[]) {
         if (arg_daemonize) {
                 pid_t pid;
 
+                log_info("starting version " VERSION);
+
                 pid = fork();
                 switch (pid) {
                 case 0:
@@ -1684,7 +1684,9 @@ int main(int argc, char *argv[]) {
 
                 write_string_file("/proc/self/oom_score_adj", "-1000");
         } else
-                sd_notify(true, "READY=1");
+                sd_notify(true,
+                          "READY=1\n"
+                          "STATUS=Processing...");
 
         r = manager_listen(manager);
         if (r < 0)