diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-11 17:06:17 -0500 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2018-10-29 10:41:48 +0100 |
| commit | e0f2dd42fb02aa5767d38714c95ac10fb683ad67 (patch) | |
| tree | 687347877baa37c616668583503d190f4aa98591 | |
| parent | 80d5f0e2057717e9e5588edcabac95b8c238795c (diff) | |
| download | systemd-e0f2dd42fb02aa5767d38714c95ac10fb683ad67.tar.gz | |
resolved: create /etc/resolv.conf symlink at runtimev239-8
If the symlink doesn't exists, and we are being started, let's
create it to provie name resolution.
If it exists, do nothing. In particular, if it is a broken symlink,
we cannot really know if the administator configured it to point to
a location used by some service that hasn't started yet, so we
don't touch it in that case either.
https://bugzilla.redhat.com/show_bug.cgi?id=1313085
| -rw-r--r-- | src/resolve/resolved.c | 4 | ||||
| -rw-r--r-- | tmpfiles.d/etc.conf.m4 | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c index c01e53e9da..f3d96df458 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -53,6 +53,10 @@ int main(int argc, char *argv[]) { /* Drop privileges, but only if we have been started as root. If we are not running as root we assume all * privileges are already dropped. */ if (getuid() == 0) { + r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); + if (r < 0 && errno != EEXIST) + log_warning_errno(errno, + "Could not create /etc/resolv.conf symlink: %m"); /* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */ r = drop_privileges(uid, gid, diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 index df8d42101c..928105ea8d 100644 --- a/tmpfiles.d/etc.conf.m4 +++ b/tmpfiles.d/etc.conf.m4 @@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts m4_ifdef(`HAVE_SMACK_RUN_LABEL', t /etc/mtab - - - - security.SMACK64=_ )m4_dnl -m4_ifdef(`ENABLE_RESOLVE', -L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf -)m4_dnl C /etc/nsswitch.conf - - - - m4_ifdef(`HAVE_PAM', C /etc/pam.d - - - - |