Compare commits
6 Commits
e8c47f7370
...
4ee40eefce
Author | SHA1 | Date |
---|---|---|
Zbigniew Jędrzejewski-Szmek | 4ee40eefce | |
Lennart Poettering | 81d2fe53fc | |
Niklas Hambüchen | 69123c218c | |
Lennart Poettering | e309b929ba | |
Lennart Poettering | 86775e3524 | |
Lennart Poettering | 082814743f |
|
@ -140,7 +140,7 @@
|
||||||
<literal>us</literal>. To turn off any kind of rate limiting,
|
<literal>us</literal>. To turn off any kind of rate limiting,
|
||||||
set either value to 0.</para>
|
set either value to 0.</para>
|
||||||
|
|
||||||
<para>Note that the effective rate limit is multiplied with a
|
<para>Note that the effective rate limit is multiplied by a
|
||||||
factor derived from the available free disk space for the journal.
|
factor derived from the available free disk space for the journal.
|
||||||
Currently, this factor is calculated using the base 2 logarithm.</para>
|
Currently, this factor is calculated using the base 2 logarithm.</para>
|
||||||
|
|
||||||
|
|
|
@ -1099,29 +1099,60 @@
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><option>--resolv-conf=</option></term>
|
<term><option>--resolv-conf=</option></term>
|
||||||
|
|
||||||
<listitem><para>Configures how <filename>/etc/resolv.conf</filename> inside of the container (i.e. DNS
|
<listitem><para>Configures how <filename>/etc/resolv.conf</filename> inside of the container shall be
|
||||||
configuration synchronization from host to container) shall be handled. Takes one of <literal>off</literal>,
|
handled (i.e. DNS configuration synchronization from host to container). Takes one of
|
||||||
<literal>copy-host</literal>, <literal>copy-static</literal>, <literal>bind-host</literal>,
|
<literal>off</literal>, <literal>copy-host</literal>, <literal>copy-static</literal>,
|
||||||
<literal>bind-static</literal>, <literal>delete</literal> or <literal>auto</literal>. If set to
|
<literal>copy-uplink</literal>, <literal>copy-stub</literal>, <literal>replace-host</literal>,
|
||||||
<literal>off</literal> the <filename>/etc/resolv.conf</filename> file in the container is left as it is
|
<literal>replace-static</literal>, <literal>replace-uplink</literal>,
|
||||||
included in the image, and neither modified nor bind mounted over. If set to <literal>copy-host</literal>, the
|
<literal>replace-stub</literal>, <literal>bind-host</literal>, <literal>bind-static</literal>,
|
||||||
<filename>/etc/resolv.conf</filename> file from the host is copied into the container. Similar, if
|
<literal>bind-uplink</literal>, <literal>bind-stub</literal>, <literal>delete</literal> or
|
||||||
<literal>bind-host</literal> is used, the file is bind mounted from the host into the container. If set to
|
<literal>auto</literal>.</para>
|
||||||
<literal>copy-static</literal> the static <filename>resolv.conf</filename> file supplied with
|
|
||||||
<citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> is
|
<para>If set to <literal>off</literal> the <filename>/etc/resolv.conf</filename> file in the
|
||||||
copied into the container, and correspondingly <literal>bind-static</literal> bind mounts it there. If set to
|
container is left as it is included in the image, and neither modified nor bind mounted over.</para>
|
||||||
<literal>delete</literal> the <filename>/etc/resolv.conf</filename> file in the container is deleted if it
|
|
||||||
exists. Finally, if set to <literal>auto</literal> the file is left as it is if private networking is turned on
|
<para>If set to <literal>copy-host</literal>, the <filename>/etc/resolv.conf</filename> file from the
|
||||||
(see <option>--private-network</option>). Otherwise, if <filename>systemd-resolved.service</filename> is
|
host is copied into the container, unless the file exists already and is not a regular file (e.g. a
|
||||||
connectible its static <filename>resolv.conf</filename> file is used, and if not the host's
|
symlink). Similar, if <literal>replace-host</literal> is used the file is copied, replacing any
|
||||||
<filename>/etc/resolv.conf</filename> file is used. In the latter cases the file is copied if the image is
|
existing inode, including symlinks. Similar, if <literal>bind-host</literal> is used, the file is
|
||||||
writable, and bind mounted otherwise. It's recommended to use <literal>copy</literal> if the container shall be
|
bind mounted from the host into the container.</para>
|
||||||
able to make changes to the DNS configuration on its own, deviating from the host's settings. Otherwise
|
|
||||||
<literal>bind</literal> is preferable, as it means direct changes to <filename>/etc/resolv.conf</filename> in
|
<para>If set to <literal>copy-static</literal>, <literal>replace-static</literal> or
|
||||||
the container are not allowed, as it is a read-only bind mount (but note that if the container has enough
|
<literal>bind-static</literal> the static <filename>resolv.conf</filename> file supplied with
|
||||||
privileges, it might simply go ahead and unmount the bind mount anyway). Note that both if the file is bind
|
<citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||||
mounted and if it is copied no further propagation of configuration is generally done after the one-time early
|
(specifically: <filename>/usr/lib/systemd/resolv.conf</filename>) is copied or bind mounted into the
|
||||||
initialization (this is because the file is usually updated through copying and renaming). Defaults to
|
container.</para>
|
||||||
|
|
||||||
|
<para>If set to <literal>copy-uplink</literal>, <literal>replace-uplink</literal> or
|
||||||
|
<literal>bind-uplink</literal> the uplink <filename>resolv.conf</filename> file managed by
|
||||||
|
<filename>systemd-resolved.service</filename> (specifically:
|
||||||
|
<filename>/run/systemd/resolve/resolv.conf</filename>) is copied or bind mounted into the
|
||||||
|
container.</para>
|
||||||
|
|
||||||
|
<para>If set to <literal>copy-stub</literal>, <literal>replace-stub</literal> or
|
||||||
|
<literal>bind-stub</literal> the stub <filename>resolv.conf</filename> file managed by
|
||||||
|
<filename>systemd-resolved.service</filename> (specifically:
|
||||||
|
<filename>/run/systemd/resolve/stub-resolv.conf</filename>) is copied or bind mounted into the
|
||||||
|
container.</para>
|
||||||
|
|
||||||
|
<para>If set to <literal>delete</literal> the <filename>/etc/resolv.conf</filename> file in the
|
||||||
|
container is deleted if it exists.</para>
|
||||||
|
|
||||||
|
<para>Finally, if set to <literal>auto</literal> the file is left as it is if private networking is
|
||||||
|
turned on (see <option>--private-network</option>). Otherwise, if
|
||||||
|
<filename>systemd-resolved.service</filename> is connectible its stub
|
||||||
|
<filename>resolv.conf</filename> file is used, and if not the host's
|
||||||
|
<filename>/etc/resolv.conf</filename> file is used. In the latter cases the file is copied if the
|
||||||
|
image is writable, and bind mounted otherwise.</para>
|
||||||
|
|
||||||
|
<para>It's recommended to use <literal>copy-…</literal> or <literal>replace-…</literal> if the
|
||||||
|
container shall be able to make changes to the DNS configuration on its own, deviating from the
|
||||||
|
host's settings. Otherwise <literal>bind</literal> is preferable, as it means direct changes to
|
||||||
|
<filename>/etc/resolv.conf</filename> in the container are not allowed, as it is a read-only bind
|
||||||
|
mount (but note that if the container has enough privileges, it might simply go ahead and unmount the
|
||||||
|
bind mount anyway). Note that both if the file is bind mounted and if it is copied no further
|
||||||
|
propagation of configuration is generally done after the one-time early initialization (this is
|
||||||
|
because the file is usually updated through copying and renaming). Defaults to
|
||||||
<literal>auto</literal>.</para></listitem>
|
<literal>auto</literal>.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ int expose_port_parse(ExposePort **l, const char *s) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return -EINVAL;
|
return r;
|
||||||
|
|
||||||
LIST_FOREACH(ports, p, *l)
|
LIST_FOREACH(ports, p, *l)
|
||||||
if (p->protocol == protocol && p->host_port == host_port)
|
if (p->protocol == protocol && p->host_port == host_port)
|
||||||
|
@ -62,9 +62,11 @@ int expose_port_parse(ExposePort **l, const char *s) {
|
||||||
if (!p)
|
if (!p)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
p->protocol = protocol;
|
*p = (ExposePort) {
|
||||||
p->host_port = host_port;
|
.protocol = protocol,
|
||||||
p->container_port = container_port;
|
.host_port = host_port,
|
||||||
|
.container_port = container_port,
|
||||||
|
};
|
||||||
|
|
||||||
LIST_PREPEND(ports, *l, p);
|
LIST_PREPEND(ports, *l, p);
|
||||||
|
|
||||||
|
@ -115,7 +117,6 @@ int expose_port_flush(ExposePort* l, union in_addr_union *exposed) {
|
||||||
|
|
||||||
int expose_port_execute(sd_netlink *rtnl, ExposePort *l, union in_addr_union *exposed) {
|
int expose_port_execute(sd_netlink *rtnl, ExposePort *l, union in_addr_union *exposed) {
|
||||||
_cleanup_free_ struct local_address *addresses = NULL;
|
_cleanup_free_ struct local_address *addresses = NULL;
|
||||||
_cleanup_free_ char *pretty = NULL;
|
|
||||||
union in_addr_union new_exposed;
|
union in_addr_union new_exposed;
|
||||||
ExposePort *p;
|
ExposePort *p;
|
||||||
bool add;
|
bool add;
|
||||||
|
@ -144,8 +145,11 @@ int expose_port_execute(sd_netlink *rtnl, ExposePort *l, union in_addr_union *ex
|
||||||
if (in_addr_equal(af, exposed, &new_exposed))
|
if (in_addr_equal(af, exposed, &new_exposed))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (DEBUG_LOGGING) {
|
||||||
|
_cleanup_free_ char *pretty = NULL;
|
||||||
in_addr_to_string(af, &new_exposed, &pretty);
|
in_addr_to_string(af, &new_exposed, &pretty);
|
||||||
log_debug("New container IP is %s.", strna(pretty));
|
log_debug("New container IP is %s.", strna(pretty));
|
||||||
|
}
|
||||||
|
|
||||||
LIST_FOREACH(ports, p, l) {
|
LIST_FOREACH(ports, p, l) {
|
||||||
|
|
||||||
|
|
|
@ -821,8 +821,16 @@ static const char *const resolv_conf_mode_table[_RESOLV_CONF_MODE_MAX] = {
|
||||||
[RESOLV_CONF_OFF] = "off",
|
[RESOLV_CONF_OFF] = "off",
|
||||||
[RESOLV_CONF_COPY_HOST] = "copy-host",
|
[RESOLV_CONF_COPY_HOST] = "copy-host",
|
||||||
[RESOLV_CONF_COPY_STATIC] = "copy-static",
|
[RESOLV_CONF_COPY_STATIC] = "copy-static",
|
||||||
|
[RESOLV_CONF_COPY_UPLINK] = "copy-uplink",
|
||||||
|
[RESOLV_CONF_COPY_STUB] = "copy-stub",
|
||||||
|
[RESOLV_CONF_REPLACE_HOST] = "replace-host",
|
||||||
|
[RESOLV_CONF_REPLACE_STATIC] = "replace-static",
|
||||||
|
[RESOLV_CONF_REPLACE_UPLINK] = "replace-uplink",
|
||||||
|
[RESOLV_CONF_REPLACE_STUB] = "replace-stub",
|
||||||
[RESOLV_CONF_BIND_HOST] = "bind-host",
|
[RESOLV_CONF_BIND_HOST] = "bind-host",
|
||||||
[RESOLV_CONF_BIND_STATIC] = "bind-static",
|
[RESOLV_CONF_BIND_STATIC] = "bind-static",
|
||||||
|
[RESOLV_CONF_BIND_UPLINK] = "bind-uplink",
|
||||||
|
[RESOLV_CONF_BIND_STUB] = "bind-stub",
|
||||||
[RESOLV_CONF_DELETE] = "delete",
|
[RESOLV_CONF_DELETE] = "delete",
|
||||||
[RESOLV_CONF_AUTO] = "auto",
|
[RESOLV_CONF_AUTO] = "auto",
|
||||||
};
|
};
|
||||||
|
|
|
@ -38,10 +38,18 @@ typedef enum UserNamespaceMode {
|
||||||
|
|
||||||
typedef enum ResolvConfMode {
|
typedef enum ResolvConfMode {
|
||||||
RESOLV_CONF_OFF,
|
RESOLV_CONF_OFF,
|
||||||
RESOLV_CONF_COPY_HOST,
|
RESOLV_CONF_COPY_HOST, /* /etc/resolv.conf */
|
||||||
RESOLV_CONF_COPY_STATIC,
|
RESOLV_CONF_COPY_STATIC, /* /usr/lib/systemd/resolv.conf */
|
||||||
|
RESOLV_CONF_COPY_UPLINK, /* /run/systemd/resolve/resolv.conf */
|
||||||
|
RESOLV_CONF_COPY_STUB, /* /run/systemd/resolve/stub-resolv.conf */
|
||||||
|
RESOLV_CONF_REPLACE_HOST,
|
||||||
|
RESOLV_CONF_REPLACE_STATIC,
|
||||||
|
RESOLV_CONF_REPLACE_UPLINK,
|
||||||
|
RESOLV_CONF_REPLACE_STUB,
|
||||||
RESOLV_CONF_BIND_HOST,
|
RESOLV_CONF_BIND_HOST,
|
||||||
RESOLV_CONF_BIND_STATIC,
|
RESOLV_CONF_BIND_STATIC,
|
||||||
|
RESOLV_CONF_BIND_UPLINK,
|
||||||
|
RESOLV_CONF_BIND_STUB,
|
||||||
RESOLV_CONF_DELETE,
|
RESOLV_CONF_DELETE,
|
||||||
RESOLV_CONF_AUTO,
|
RESOLV_CONF_AUTO,
|
||||||
_RESOLV_CONF_MODE_MAX,
|
_RESOLV_CONF_MODE_MAX,
|
||||||
|
|
|
@ -79,6 +79,7 @@
|
||||||
#include "ptyfwd.h"
|
#include "ptyfwd.h"
|
||||||
#include "random-util.h"
|
#include "random-util.h"
|
||||||
#include "raw-clone.h"
|
#include "raw-clone.h"
|
||||||
|
#include "resolve-util.h"
|
||||||
#include "rlimit-util.h"
|
#include "rlimit-util.h"
|
||||||
#include "rm-rf.h"
|
#include "rm-rf.h"
|
||||||
#if HAVE_SECCOMP
|
#if HAVE_SECCOMP
|
||||||
|
@ -100,12 +101,6 @@
|
||||||
#include "user-util.h"
|
#include "user-util.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
#if HAVE_SPLIT_USR
|
|
||||||
#define STATIC_RESOLV_CONF "/lib/systemd/resolv.conf"
|
|
||||||
#else
|
|
||||||
#define STATIC_RESOLV_CONF "/usr/lib/systemd/resolv.conf"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* nspawn is listening on the socket at the path in the constant nspawn_notify_socket_path
|
/* nspawn is listening on the socket at the path in the constant nspawn_notify_socket_path
|
||||||
* nspawn_notify_socket_path is relative to the container
|
* nspawn_notify_socket_path is relative to the container
|
||||||
* the init process in the container pid can send messages to nspawn following the sd_notify(3) protocol */
|
* the init process in the container pid can send messages to nspawn following the sd_notify(3) protocol */
|
||||||
|
@ -1850,12 +1845,13 @@ static int setup_resolv_conf(const char *dest) {
|
||||||
if (arg_resolv_conf == RESOLV_CONF_AUTO) {
|
if (arg_resolv_conf == RESOLV_CONF_AUTO) {
|
||||||
if (arg_private_network)
|
if (arg_private_network)
|
||||||
m = RESOLV_CONF_OFF;
|
m = RESOLV_CONF_OFF;
|
||||||
else if (have_resolv_conf(STATIC_RESOLV_CONF) > 0 && resolved_listening() > 0)
|
else if (have_resolv_conf(PRIVATE_STUB_RESOLV_CONF) > 0 && resolved_listening() > 0)
|
||||||
m = etc_writable() ? RESOLV_CONF_COPY_STATIC : RESOLV_CONF_BIND_STATIC;
|
m = etc_writable() ? RESOLV_CONF_COPY_STUB : RESOLV_CONF_BIND_STUB;
|
||||||
else if (have_resolv_conf("/etc/resolv.conf") > 0)
|
else if (have_resolv_conf("/etc/resolv.conf") > 0)
|
||||||
m = etc_writable() ? RESOLV_CONF_COPY_HOST : RESOLV_CONF_BIND_HOST;
|
m = etc_writable() ? RESOLV_CONF_COPY_HOST : RESOLV_CONF_BIND_HOST;
|
||||||
else
|
else
|
||||||
m = etc_writable() ? RESOLV_CONF_DELETE : RESOLV_CONF_OFF;
|
m = etc_writable() ? RESOLV_CONF_DELETE : RESOLV_CONF_OFF;
|
||||||
|
|
||||||
} else
|
} else
|
||||||
m = arg_resolv_conf;
|
m = arg_resolv_conf;
|
||||||
|
|
||||||
|
@ -1877,12 +1873,16 @@ static int setup_resolv_conf(const char *dest) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IN_SET(m, RESOLV_CONF_BIND_STATIC, RESOLV_CONF_COPY_STATIC))
|
if (IN_SET(m, RESOLV_CONF_BIND_STATIC, RESOLV_CONF_REPLACE_STATIC, RESOLV_CONF_COPY_STATIC))
|
||||||
what = STATIC_RESOLV_CONF;
|
what = PRIVATE_STATIC_RESOLV_CONF;
|
||||||
|
else if (IN_SET(m, RESOLV_CONF_BIND_UPLINK, RESOLV_CONF_REPLACE_UPLINK, RESOLV_CONF_COPY_UPLINK))
|
||||||
|
what = PRIVATE_UPLINK_RESOLV_CONF;
|
||||||
|
else if (IN_SET(m, RESOLV_CONF_BIND_STUB, RESOLV_CONF_REPLACE_STUB, RESOLV_CONF_COPY_STUB))
|
||||||
|
what = PRIVATE_STUB_RESOLV_CONF;
|
||||||
else
|
else
|
||||||
what = "/etc/resolv.conf";
|
what = "/etc/resolv.conf";
|
||||||
|
|
||||||
if (IN_SET(m, RESOLV_CONF_BIND_HOST, RESOLV_CONF_BIND_STATIC)) {
|
if (IN_SET(m, RESOLV_CONF_BIND_HOST, RESOLV_CONF_BIND_STATIC, RESOLV_CONF_BIND_UPLINK, RESOLV_CONF_BIND_STUB)) {
|
||||||
_cleanup_free_ char *resolved = NULL;
|
_cleanup_free_ char *resolved = NULL;
|
||||||
int found;
|
int found;
|
||||||
|
|
||||||
|
@ -1898,9 +1898,13 @@ static int setup_resolv_conf(const char *dest) {
|
||||||
r = mount_verbose(LOG_WARNING, what, resolved, NULL, MS_BIND, NULL);
|
r = mount_verbose(LOG_WARNING, what, resolved, NULL, MS_BIND, NULL);
|
||||||
if (r >= 0)
|
if (r >= 0)
|
||||||
return mount_verbose(LOG_ERR, NULL, resolved, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_NOSUID|MS_NODEV, NULL);
|
return mount_verbose(LOG_ERR, NULL, resolved, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_NOSUID|MS_NODEV, NULL);
|
||||||
}
|
|
||||||
|
|
||||||
/* If that didn't work, let's copy the file */
|
/* If that didn't work, let's copy the file */
|
||||||
|
}
|
||||||
|
|
||||||
|
if (IN_SET(m, RESOLV_CONF_REPLACE_HOST, RESOLV_CONF_REPLACE_STATIC, RESOLV_CONF_REPLACE_UPLINK, RESOLV_CONF_REPLACE_STUB))
|
||||||
|
r = copy_file_atomic(what, where, 0644, 0, 0, COPY_REFLINK|COPY_REPLACE);
|
||||||
|
else
|
||||||
r = copy_file(what, where, O_TRUNC|O_NOFOLLOW, 0644, 0, 0, COPY_REFLINK);
|
r = copy_file(what, where, O_TRUNC|O_NOFOLLOW, 0644, 0, 0, COPY_REFLINK);
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
/* If the file already exists as symlink, let's suppress the warning, under the assumption that
|
/* If the file already exists as symlink, let's suppress the warning, under the assumption that
|
||||||
|
@ -1908,7 +1912,8 @@ static int setup_resolv_conf(const char *dest) {
|
||||||
*
|
*
|
||||||
* If the disk image is read-only, there's also no point in complaining.
|
* If the disk image is read-only, there's also no point in complaining.
|
||||||
*/
|
*/
|
||||||
log_full_errno(!IN_SET(RESOLV_CONF_COPY_HOST, RESOLV_CONF_COPY_STATIC) && IN_SET(r, -ELOOP, -EROFS, -EACCES, -EPERM) ? LOG_DEBUG : LOG_WARNING, r,
|
log_full_errno(!IN_SET(RESOLV_CONF_COPY_HOST, RESOLV_CONF_COPY_STATIC, RESOLV_CONF_COPY_UPLINK, RESOLV_CONF_COPY_STUB) &&
|
||||||
|
IN_SET(r, -ELOOP, -EROFS, -EACCES, -EPERM) ? LOG_DEBUG : LOG_WARNING, r,
|
||||||
"Failed to copy /etc/resolv.conf to %s, ignoring: %m", where);
|
"Failed to copy /etc/resolv.conf to %s, ignoring: %m", where);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,15 +18,6 @@
|
||||||
#include "strv.h"
|
#include "strv.h"
|
||||||
#include "tmpfile-util-label.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) {
|
int manager_check_resolv_conf(const Manager *m) {
|
||||||
struct stat st, own;
|
struct stat st, own;
|
||||||
|
|
||||||
|
|
|
@ -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_;
|
const char* dns_cache_mode_to_string(DnsCacheMode p) _const_;
|
||||||
DnsCacheMode dns_cache_mode_from_string(const char *s) _pure_;
|
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"
|
||||||
|
|
Loading…
Reference in New Issue