From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 30 Jan 2023 03:29:45 +0000 (+0000)
Subject: networkd: Set configuration path from build scripts
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c1452a43a6a8d3d3596fa8be38741e62852ce5c;p=network.git

networkd: Set configuration path from build scripts

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 1b18f62b..3cc7ce94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -315,7 +315,8 @@ dist_networkd_SOURCES = \
 	src/networkd/string.h
 
 networkd_CPPFLAGS = \
-	$(AM_CPPFLAGS)
+	$(AM_CPPFLAGS) \
+	-DCONFIG_DIR="\"$(configdir)\""
 
 networkd_CFLAGS = \
 	$(AM_CFLAGS) \
diff --git a/src/networkd/daemon.c b/src/networkd/daemon.c
index bd5f1f00..9077c545 100644
--- a/src/networkd/daemon.c
+++ b/src/networkd/daemon.c
@@ -109,7 +109,7 @@ static int nw_daemon_setup(struct nw_daemon* daemon) {
 	int r;
 
 	// Read configuration file
-	r = nw_config_read(&daemon->config, "/etc/network/settings");
+	r = nw_config_read(&daemon->config, CONFIG_DIR "/settings");
 	if (r)
 		return r;