networkd: fix creation of runtime dirs at startup

This allows us to drop the repeated attempted creations of the runtime dirs during runtime.

diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index f7a204af82a91380fe6fff6a98a3a04762323fbe..e6d80d4c665da578971aae46d1e9bf392f9b2875 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -297,10 +297,6 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
         assert(lease);
         assert(lease_file);
 
-        r = mkdir_safe_label("/run/systemd/network/leases", 0755, 0, 0);
-        if (r < 0)
-                goto finish;
-
         r = fopen_temporary(lease_file, &f, &temp_path);
         if (r < 0)
                 goto finish;

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 39cef2254cb202cbd3d55c87ed972971ac51ce61..2650f863575b92c23e0f43e01798248ce8432b6a 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -1367,10 +1367,6 @@ int link_save(Link *link) {
         assert(link);
         assert(link->state_file);
 
-        r = mkdir_safe_label("/run/systemd/network/links", 0755, 0, 0);
-        if (r < 0)
-                goto finish;
-
         r = fopen_temporary(link->state_file, &f, &temp_path);
         if (r < 0)
                 goto finish;

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index f41914f8809a5fb20f73b4848dbe152c472fd54f..8c2f5efbd34120416e091c4b09327b715954130f 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -407,10 +407,6 @@ int manager_update_resolv_conf(Manager *m) {
 
         assert(m);
 
-        r = mkdir_safe_label("/run/systemd/network", 0755, 0, 0);
-        if (r < 0)
-                return r;
-
         r = fopen_temporary("/run/systemd/network/resolv.conf", &f, &temp_path);
         if (r < 0)
                 return r;

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 2f6a12dbccfddb58f5068a63ff1fb7b1c86141bb..f0e6ad5201a5476f35ceb1e20cbc9b030313cb1c 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -42,8 +42,20 @@ int main(int argc, char *argv[]) {
 
         /* Always create the directories people can create inotify
          * watches in. */
-        mkdir_label("/run/systemd/network/links", 0755);
-        mkdir_label("/run/systemd/network/leases", 0755);
+        r = mkdir_label("/run/systemd/network", 0755);
+        if (r < 0)
+                log_error("Could not create runtime directory: %s",
+                          strerror(-r));
+
+        r = mkdir_label("/run/systemd/network/links", 0755);
+        if (r < 0)
+                log_error("Could not create runtime directory 'links': %s",
+                          strerror(-r));
+
+        r = mkdir_label("/run/systemd/network/leases", 0755);
+        if (r < 0)
+                log_error("Could not create runtime directory 'leases': %s",
+                          strerror(-r));
 
         r = manager_new(&m);
         if (r < 0) {