ad868e1c6b
See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for details. - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1177
54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
From 1aa6cfc7ff05929f013262c86ab7557e5394fb4c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Fri, 11 Mar 2016 17:06:17 -0500
|
|
Subject: [PATCH 11/11] resolved: create /etc/resolv.conf symlink at runtime
|
|
|
|
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
|
|
---
|
|
src/resolve/resolved.c | 6 ++++++
|
|
tmpfiles.d/etc.conf.in | 3 ---
|
|
2 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
|
|
index aabaa266e9..39277ea487 100644
|
|
--- a/src/resolve/resolved.c
|
|
+++ b/src/resolve/resolved.c
|
|
@@ -53,6 +53,12 @@ static int run(int argc, char *argv[]) {
|
|
if (r < 0)
|
|
return log_error_errno(r, "Cannot resolve user name %s: %m", user);
|
|
|
|
+ /* As we're root, we can create /etc/resolv.conf symlink if it doesn't exist already */
|
|
+ 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");
|
|
+
|
|
/* As we're root, we can create the directory where resolv.conf will live */
|
|
r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid, MKDIR_WARN_MODE);
|
|
if (r < 0)
|
|
diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in
|
|
index 2323fd8cd8..ebdc699c26 100644
|
|
--- a/tmpfiles.d/etc.conf.in
|
|
+++ b/tmpfiles.d/etc.conf.in
|
|
@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
|
|
{% if HAVE_SMACK_RUN_LABEL %}
|
|
t /etc/mtab - - - - security.SMACK64=_
|
|
{% endif %}
|
|
-{% if ENABLE_RESOLVE %}
|
|
-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
|
|
-{% endif %}
|
|
C! /etc/nsswitch.conf - - - -
|
|
{% if HAVE_PAM %}
|
|
C! /etc/pam.d - - - -
|
|
--
|
|
2.26.2
|
|
|