From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 4 Oct 2024 10:56:34 +0000 (+0200)
Subject: path-lookup: move NETWORK_DIRS to network-util.h
X-Git-Tag: v257-rc1~317^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd7d732dc54ed3bcd2dd22273473bc410f501226;p=thirdparty%2Fsystemd.git

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

diff --git a/src/basic/path-lookup.h b/src/basic/path-lookup.h
index 0db2c5a98ca..fab6edd6ca1 100644
--- 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 6fc6015902e..14c6f6819d6 100644
--- 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 ebeeec11943..096f3a11563 100644
--- 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 53f74f6e8b0..8e58a1ae123 100644
--- 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 eeddfb22811..7ef7668f305 100644
--- 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 b6d34c4a9cb..1fff2640366 100644
--- 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 645c7f840a9..edfbb38ad84 100644
--- 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"