2019-07-30 19:39:02 +00:00
|
|
|
From 0c670fec00f3d5c103d9b7415d4e0510c61ad006 Mon Sep 17 00:00:00 2001
|
2016-03-11 22:49:05 +00:00
|
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
|
|
Date: Fri, 11 Mar 2016 17:06:17 -0500
|
2016-07-26 19:12:35 +00:00
|
|
|
Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime
|
2016-03-11 22:49:05 +00:00
|
|
|
|
2019-12-15 12:25:15 +00:00
|
|
|
If the symlink exists, do nothing. In particular, if it is a broken symlink,
|
2016-03-11 22:49:05 +00:00
|
|
|
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 | 4 ++++
|
|
|
|
|
tmpfiles.d/etc.conf.m4 | 3 ---
|
|
|
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
|
2019-07-30 19:39:02 +00:00
|
|
|
index f82e0b82ce..66a777bdb2 100644
|
2016-03-11 22:49:05 +00:00
|
|
|
--- a/tmpfiles.d/etc.conf.m4
|
|
|
|
|
+++ b/tmpfiles.d/etc.conf.m4
|
2019-07-30 19:39:02 +00:00
|
|
|
@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts
|
2016-03-11 22:49:05 +00:00
|
|
|
m4_ifdef(`HAVE_SMACK_RUN_LABEL',
|
|
|
|
|
t /etc/mtab - - - - security.SMACK64=_
|
|
|
|
|
)m4_dnl
|
2017-10-06 13:58:05 +00:00
|
|
|
-m4_ifdef(`ENABLE_RESOLVE',
|
2017-12-15 08:36:03 +00:00
|
|
|
-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf
|
2016-03-11 22:49:05 +00:00
|
|
|
-)m4_dnl
|
2019-07-30 19:39:02 +00:00
|
|
|
C! /etc/nsswitch.conf - - - -
|
2016-03-11 22:49:05 +00:00
|
|
|
m4_ifdef(`HAVE_PAM',
|
2019-07-30 19:39:02 +00:00
|
|
|
C! /etc/pam.d - - - -
|
