picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

network: move configuration to /etc/systemd/network

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

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

0
links/99-default.link → network/99-default.link
View file

6
src/udev/net/link-config.c
View file

@ -74,9 +74,9 @@ int link_config_ctx_new(link_config_ctx **ret) {
LIST_HEAD_INIT(ctx->links); LIST_HEAD_INIT(ctx->links);
ctx->link_dirs = strv_new("/etc/net/links", ctx->link_dirs = strv_new("/etc/systemd/network",
"/run/net/links", "/run/systemd/network",
"/usr/lib/net/links", "/usr/lib/systemd/network",
NULL); NULL);
if (!ctx->link_dirs) { if (!ctx->link_dirs) {
log_error("failed to build link config directory array"); log_error("failed to build link config directory array");