diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | network/99-default.link (renamed from links/99-default.link) | 0 | ||||
| -rw-r--r-- | src/udev/net/link-config.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index bb182173f..bf5459a7b 100644 --- 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 index 05be03bd3..05be03bd3 100644 --- a/links/99-default.link +++ b/network/99-default.link diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index 089bd7656..0a86d0eb7 100644 --- 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"); |