network: move NETWORK_DIRS to path-lookup.h

In preparation for future changes...
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-03-24 17:02:11 +01:00
parent 96d33e4ac0
commit b0c8219260
6 changed files with 7 additions and 3 deletions

View File

@@ -5,6 +5,7 @@
typedef struct LookupPaths LookupPaths;
#include "def.h"
#include "unit-file.h"
#include "macro.h"
@@ -68,3 +69,5 @@ void lookup_paths_free(LookupPaths *p);
char **generator_binary_paths(UnitFileScope scope);
char **env_generator_binary_paths(bool is_system);
#define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network"))

View File

@@ -8,7 +8,6 @@
#include "sd-dhcp-lease.h"
#include "conf-parser.h"
#include "def.h"
#include "set.h"
#include "strv.h"
@@ -66,5 +65,3 @@ int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, size_t
/* It is not necessary to add deserialize_dhcp_option(). Use unhexmem() instead. */
int serialize_dhcp_option(FILE *f, const char *key, const void *data, size_t size);
#define NETWORK_DIRS ((const char* const*) CONF_PATHS_STRV("systemd/network"))

View File

@@ -24,6 +24,7 @@
#include "network-internal.h"
#include "networkd-manager.h"
#include "nlmon.h"
#include "path-lookup.h"
#include "siphash24.h"
#include "stat-util.h"
#include "string-table.h"

View File

@@ -30,6 +30,7 @@
#include "networkd-network-bus.h"
#include "networkd-speed-meter.h"
#include "ordered-set.h"
#include "path-lookup.h"
#include "path-util.h"
#include "set.h"
#include "signal-util.h"

View File

@@ -16,6 +16,7 @@
#include "networkd-manager.h"
#include "networkd-network.h"
#include "parse-util.h"
#include "path-lookup.h"
#include "set.h"
#include "socket-util.h"
#include "stat-util.h"

View File

@@ -20,6 +20,7 @@
#include "netlink-util.h"
#include "network-internal.h"
#include "parse-util.h"
#include "path-lookup.h"
#include "path-util.h"
#include "proc-cmdline.h"
#include "random-util.h"