network: move configuration to /etc/systemd/network

This is private configuraiton, so let's not pollute the namespace (and hence make Debian happy :) ).

diff --git a/Makefile.am b/Makefile.am
index bb182173f71202638d11a325c72bc13892874c19..bf5459a7b8fe9e16c7dd555ccf7c732a46e5cc7e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-linksdir=$(prefix)/lib/net/links
+networkdir=$(prefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -2214,8 +2214,8 @@ INSTALL_DIRS += \
        $(sysconfdir)/udev/rules.d \
        $(sysconfdir)/udev/hwdb.d
 
-dist_links_DATA = \
-       links/99-default.link
+dist_network_DATA = \
+       network/99-default.link
 
 dist_udevrules_DATA += \
        rules/99-systemd.rules \
@@ -4492,8 +4492,8 @@ endif
 INSTALL_DIRS += \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
-       $(prefix)/lib/net/links \
-       $(sysconfdir)/net/links \
+       $(prefix)/lib/systemd/network \
+       $(sysconfdir)/systemd/network \
        $(prefix)/lib/sysctl.d \
        $(sysconfdir)/sysctl.d \
        $(prefix)/lib/kernel/install.d \

diff --git a/links/99-default.link b/network/99-default.link
similarity index 100%
rename from links/99-default.link
rename to network/99-default.link

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 089bd76564e4d09371171abadd8dcb310ea3a13c..0a86d0eb77e4a4086e94f576f535f6c480ea83da 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -74,9 +74,9 @@ int link_config_ctx_new(link_config_ctx **ret) {
 
         LIST_HEAD_INIT(ctx->links);
 
-        ctx->link_dirs = strv_new("/etc/net/links",
-                                  "/run/net/links",
-                                  "/usr/lib/net/links",
+        ctx->link_dirs = strv_new("/etc/systemd/network",
+                                  "/run/systemd/network",
+                                  "/usr/lib/systemd/network",
                                   NULL);
         if (!ctx->link_dirs) {
                 log_error("failed to build link config directory array");