X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=7319276c536890bc16a523063d1aff51f08d04b9;hb=0c13be389faea49fd8a370dc8186e7d5d20e967d;hp=0b386d4069261ef1145e8303783c10b987b81886;hpb=45af44d47da6933b260c734ad9ff721f63f80a4d;p=elogind.git

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 0b386d406..7319276c5 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -64,6 +64,12 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 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) |
@@ -80,21 +86,9 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
-        r = manager_udev_listen(m);
-        if (r < 0) {
-                log_error_errno(r, "Could not connect to udev: %m");
-                goto out;
-        }
-
-        r = manager_rtnl_listen(m);
-        if (r < 0) {
-                log_error_errno(r, "Could not connect to rtnl: %m");
-                goto out;
-        }
-
-        r = manager_bus_listen(m);
+        r = manager_connect_bus(m);
         if (r < 0) {
-                log_error_errno(r, "Could not connect to system bus: %m");
+                log_error_errno(r, "Could not connect to bus: %m");
                 goto out;
         }
 
@@ -116,11 +110,13 @@ int main(int argc, char *argv[]) {
                 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_errno(r, "Event loop failed: %m");
                 goto out;