X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=571f5238987e479cabec1403ab9b1f27a728cae1;hp=cd7dd3ca0f59ca67db4f9c527b6909bfbb174ab7;hb=a97dcc12e486ecff531809802930a26c4da827f2;hpb=d3cf48f4bd3d69a276f17aa7c910e0b35215caba

diff --git a/src/network/networkd.c b/src/network/networkd.c
index cd7dd3ca0..571f52389 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -46,84 +46,79 @@ int main(int argc, char *argv[]) {
 
         r = get_user_creds(&user, &uid, &gid, NULL, NULL);
         if (r < 0) {
-                log_error("Cannot resolve user name %s: %s", user, strerror(-r));
+                log_error_errno(r, "Cannot resolve user name %s: %m", user);
                 goto out;
         }
 
         /* Always create the directories people can create inotify
          * watches in. */
-        r = mkdir_safe_label("/run/systemd/network", 0755, uid, gid);
+        r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory: %s",
-                          strerror(-r));
+                log_error_errno(r, "Could not create runtime directory: %m");
 
-        r = mkdir_safe_label("/run/systemd/network/links", 0755, uid, gid);
+        r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory 'links': %s",
-                          strerror(-r));
+                log_error_errno(r, "Could not create runtime directory 'links': %m");
 
-        r = mkdir_safe_label("/run/systemd/network/leases", 0755, uid, gid);
+        r = mkdir_safe_label("/run/systemd/netif/leases", 0755, uid, gid);
         if (r < 0)
-                log_error("Could not create runtime directory 'leases': %s",
+                log_error_errno(r, "Could not create runtime directory 'leases': %m");
+
+        r = mkdir_safe_label("/run/systemd/netif/lldp", 0755, uid, gid);
+        if (r < 0)
+                log_error("Could not create runtime directory 'lldp': %s",
                           strerror(-r));
 
+
         r = drop_privileges(uid, gid,
                             (1ULL << CAP_NET_ADMIN) |
                             (1ULL << CAP_NET_BIND_SERVICE) |
                             (1ULL << CAP_NET_BROADCAST) |
-                            (1ULL << CAP_NET_RAW) |
-                            (1ULL << CAP_SYS_MODULE));
+                            (1ULL << CAP_NET_RAW));
         if (r < 0)
                 goto out;
 
-        r = manager_new(&m);
-        if (r < 0) {
-                log_error("Could not create manager: %s", strerror(-r));
-                goto out;
-        }
+        assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
 
-        r = manager_udev_listen(m);
+        r = manager_new(&m);
         if (r < 0) {
-                log_error("Could not connect to udev: %s", strerror(-r));
+                log_error_errno(r, "Could not create manager: %m");
                 goto out;
         }
 
-        r = manager_rtnl_listen(m);
+        r = manager_load_config(m);
         if (r < 0) {
-                log_error("Could not connect to rtnl: %s", strerror(-r));
+                log_error_errno(r, "Could not load configuration files: %m");
                 goto out;
         }
 
-        r = manager_bus_listen(m);
+        r = manager_rtnl_enumerate_links(m);
         if (r < 0) {
-                log_error("Could not connect to system bus: %s", strerror(-r));
+                log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         }
 
-        r = manager_load_config(m);
+        r = manager_rtnl_enumerate_addresses(m);
         if (r < 0) {
-                log_error("Could not load configuration files: %s", strerror(-r));
+                log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         }
 
-        r = manager_rtnl_enumerate_links(m);
-        if (r < 0) {
-                log_error("Could not enumerate links: %s", strerror(-r));
-                goto out;
-        }
+        log_info("Enumeration completed");
 
         sd_notify(false,
                   "READY=1\n"
                   "STATUS=Processing requests...");
 
-        r = sd_event_loop(m->event);
+        r = manager_run(m);
         if (r < 0) {
-                log_error("Event loop failed: %s", strerror(-r));
+                log_error_errno(r, "Event loop failed: %m");
                 goto out;
         }
 
 out:
         sd_notify(false,
+                  "STOPPING=1\n"
                   "STATUS=Shutting down...");
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;