]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udevd: notify - keep NOTIFY_SOCKET around
authorTom Gundersen <teg@jklm.no>
Fri, 29 May 2015 16:32:15 +0000 (18:32 +0200)
committerTom Gundersen <teg@jklm.no>
Fri, 29 May 2015 16:52:13 +0000 (18:52 +0200)
Only unset the env var in the workers, but otherwise keep it around in the main daemon.

src/udev/udevd.c

index 5bfeefdf7df3f0eb091928648bce02669285b283..81ba6650e4c6ffadfc6e240e7f38f2e474ceafe3 100644 (file)
@@ -351,6 +351,8 @@ static void worker_spawn(Manager *manager, struct event *event) {
                 dev = event->dev;
                 event->dev = NULL;
 
+                unsetenv("NOTIFY_SOCKET");
+
                 manager_workers_free(manager);
                 event_queue_cleanup(manager, EVENT_UNDEF);
 
@@ -1684,7 +1686,7 @@ int main(int argc, char *argv[]) {
 
                 write_string_file("/proc/self/oom_score_adj", "-1000");
         } else
-                sd_notify(true,
+                sd_notify(false,
                           "READY=1\n"
                           "STATUS=Processing...");