From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Apr 2020 16:32:49 +0000 (+0200)
Subject: resolve: move resolv.conf path definitions to shared header
X-Git-Tag: v246-rc1~527^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=082814743f6d118e73dc4d38adc4c19f3b2a57ec;p=thirdparty%2Fsystemd.git

resolve: move resolv.conf path definitions to shared header

That way we can use it from nspawn.
---

diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index 6afc193f69c..c06213f4867 100644
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -18,15 +18,6 @@
 #include "strv.h"
 #include "tmpfile-util-label.h"
 
-/* A resolv.conf file containing the DNS server and domain data we learnt from uplink, i.e. the full uplink data */
-#define PRIVATE_UPLINK_RESOLV_CONF "/run/systemd/resolve/resolv.conf"
-
-/* A resolv.conf file containing the domain data we learnt from uplink, but our own DNS server address. */
-#define PRIVATE_STUB_RESOLV_CONF "/run/systemd/resolve/stub-resolv.conf"
-
-/* A static resolv.conf file containing no domains, but only our own DNS server address */
-#define PRIVATE_STATIC_RESOLV_CONF ROOTLIBEXECDIR "/resolv.conf"
-
 int manager_check_resolv_conf(const Manager *m) {
         struct stat st, own;
 
diff --git a/src/shared/resolve-util.h b/src/shared/resolve-util.h
index acf1f3dade9..0524f1a74f1 100644
--- a/src/shared/resolve-util.h
+++ b/src/shared/resolve-util.h
@@ -81,3 +81,12 @@ bool dns_server_address_valid(int family, const union in_addr_union *sa);
 
 const char* dns_cache_mode_to_string(DnsCacheMode p) _const_;
 DnsCacheMode dns_cache_mode_from_string(const char *s) _pure_;
+
+/* A resolv.conf file containing the DNS server and domain data we learnt from uplink, i.e. the full uplink data */
+#define PRIVATE_UPLINK_RESOLV_CONF "/run/systemd/resolve/resolv.conf"
+
+/* A resolv.conf file containing the domain data we learnt from uplink, but our own DNS server address. */
+#define PRIVATE_STUB_RESOLV_CONF "/run/systemd/resolve/stub-resolv.conf"
+
+/* A static resolv.conf file containing no domains, but only our own DNS server address */
+#define PRIVATE_STATIC_RESOLV_CONF ROOTLIBEXECDIR "/resolv.conf"