network: move configuration to /etc/systemd/network

This is private configuraiton, so let's not pollute the namespace (and hence make Debian happy :) ).
This commit is contained in:
Tom Gundersen 2013-10-28 20:11:10 +01:00
parent f11880744c
commit 9dc670ea76
3 changed files with 8 additions and 8 deletions

View File

@ -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 \

View File

@ -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");