chiark / gitweb /
networkd: use Type=notify
authorTom Gundersen <teg@jklm.no>
Sat, 23 Nov 2013 01:07:08 +0000 (02:07 +0100)
committerTom Gundersen <teg@jklm.no>
Sat, 23 Nov 2013 01:07:08 +0000 (02:07 +0100)
Also start earlier during boot.

src/network/networkd.c
units/systemd-networkd.service.in

index 7697830..6b13812 100644 (file)
@@ -35,28 +35,37 @@ int main(int argc, char *argv[]) {
 
         if (argc != 1) {
                 log_error("This program takes no arguments.");
-                return EXIT_FAILURE;
+                r = -EINVAL;
+                goto out;
         }
 
         r = manager_new(&m);
         if (r < 0)
-                return EXIT_FAILURE;
+                goto out;
 
         r = manager_udev_listen(m);
         if (r < 0)
-                return EXIT_FAILURE;
+                goto out;
 
         r = manager_udev_enumerate_links(m);
         if (r < 0)
-                return EXIT_FAILURE;
+                goto out;
 
         r = manager_rtnl_listen(m);
         if (r < 0)
-                return EXIT_FAILURE;
+                goto out;
+
+        sd_notify(false,
+                  "READY=1\n"
+                  "STATUS=Processing requests...");
 
         r = sd_event_loop(m->event);
         if (r < 0)
-                return EXIT_FAILURE;
+                goto out;
+
+out:
+        sd_notify(false,
+                  "STATUS=Shutting down...");
 
-        return  EXIT_SUCCESS;
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
index 52c04ed..066d852 100644 (file)
@@ -9,11 +9,11 @@
 Description=Network Service
 Documentation=man:systemd-networkd.service(8)
 DefaultDependencies=no
-After=sysinit.target
 Before=network.target
 Wants=network.target
 
 [Service]
+Type=notify
 Restart=always
 RestartSec=0
 ExecStart=@rootlibexecdir@/systemd-networkd