path-lookup: move NETWORK_DIRS to network-util.h

diff --git a/src/basic/path-lookup.h b/src/basic/path-lookup.h
index 0db2c5a98cafa8ec837ebd9c17a67ab5e1cbbf06..fab6edd6ca173218a94710e2b7e62e1b917a0829 100644 (file)
--- a/src/basic/path-lookup.h
+++ b/src/basic/path-lookup.h
@@ -70,8 +70,5 @@ void lookup_paths_done(LookupPaths *p);
 char **generator_binary_paths(RuntimeScope scope);
 char **env_generator_binary_paths(RuntimeScope scope);
 
-#define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network"))
-#define NETWORK_DIRS_NULSTR CONF_PATHS_NULSTR("systemd/network")
-
 #define PORTABLE_PROFILE_DIRS CONF_PATHS_NULSTR("systemd/portable/profile")
 int find_portable_profile(const char *name, const char *unit, char **ret_path);

diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/sd-network/network-util.h
index 6fc6015902e878bcaf632298a93b2e16347f7a09..14c6f6819d6b2185f05e19eafd04ce36db516ca2 100644 (file)
--- a/src/libsystemd/sd-network/network-util.h
+++ b/src/libsystemd/sd-network/network-util.h
@@ -4,8 +4,12 @@
 #include <errno.h>
 #include <stdbool.h>
 
+#include "constants.h"
 #include "macro.h"
 
+#define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network"))
+#define NETWORK_DIRS_NULSTR CONF_PATHS_NULSTR("systemd/network")
+
 bool network_is_online(void);
 
 typedef enum AddressFamily {

diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index ebeeec119435e96a8356f1412d4a11867e133402..096f3a11563718778ec3c3cdd14700748c8aec66 100644 (file)
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -7,6 +7,7 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "network-util.h"
 #include "nulstr-util.h"
 #include "path-lookup.h"
 #include "path-util.h"

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 53f74f6e8b00e11c1d7cc5929277a8c34a1c2e49..8e58a1ae123ed6d5c2e07fdcb649a5c19f485471 100644 (file)
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -29,6 +29,7 @@
 #include "netdevsim.h"
 #include "netif-util.h"
 #include "netlink-util.h"
+#include "network-util.h"
 #include "networkd-manager.h"
 #include "networkd-queue.h"
 #include "networkd-setlink.h"

diff --git a/src/network/networkctl-config-file.c b/src/network/networkctl-config-file.c
index eeddfb228114aafa07d7a24379d508a3c20016cc..7ef7668f30573f5d875f9af01274ecffb451336c 100644 (file)
--- a/src/network/networkctl-config-file.c
+++ b/src/network/networkctl-config-file.c
@@ -15,6 +15,7 @@
 #include "edit-util.h"
 #include "mkdir-label.h"
 #include "netlink-util.h"
+#include "network-util.h"
 #include "networkctl.h"
 #include "networkctl-config-file.h"
 #include "networkctl-util.h"

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index b6d34c4a9cbfb1a329332192d1e6f663f8529e73..1fff264036667720bdbfbf12dccd71bc13f6afec 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -15,6 +15,7 @@
 #include "in-addr-util.h"
 #include "net-condition.h"
 #include "netdev/macvlan.h"
+#include "network-util.h"
 #include "networkd-address-label.h"
 #include "networkd-address.h"
 #include "networkd-bridge-fdb.h"

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 645c7f840a90db801091603dcffd1c58ae44ca30..edfbb38ad84b7b93b9c9117cf99febde79186bbd 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -27,6 +27,7 @@
 #include "netif-sriov.h"
 #include "netif-util.h"
 #include "netlink-util.h"
+#include "network-util.h"
 #include "parse-util.h"
 #include "path-lookup.h"
 #include "path-util.h"