networkd: store ifindex as int

[elogind.git] / src / network / networkd.c

diff --git a/src/network/networkd.c b/src/network/networkd.c
index d8f31a490d6ae042ff832a035db7238df427897a..665f4c470900f6b02cddff4eb67cc5e3f3bddc1f 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -52,17 +52,17 @@ int main(int argc, char *argv[]) {
 
         /* 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));
 
-        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));
 
-        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",
                           strerror(-r));
@@ -75,6 +75,8 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 goto out;
 
+        assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
+
         r = manager_new(&m);
         if (r < 0) {
                 log_error("Could not create manager: %s", strerror(-r));