summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-05-21 14:22:30 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-05-21 14:23:09 -0400
commit6921bf11fac23d93658b4c3f91d7b63a7f5b36c6 (patch)
treed9c75257935341d53e26eb3a52af5dda80c522c2
parent4f9bca639a806e235173ec08e01de8bdcec82f81 (diff)
tmpfiles: create /etc/resolv.conf symlink only on boot
We will create the symlink on boot as a fallback to provide name resolution. But if the symlink was removed afterwards, it most likely should not be recreated. Creating it only on boot also solves the issue where it would be created prematurely during installation, before the system was actually booted. https://bugzilla.redhat.com/show_bug.cgi?id=1197204
-rw-r--r--tmpfiles.d/etc.conf.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
index ab5cd16f24..e74b02687f 100644
--- a/tmpfiles.d/etc.conf.m4
+++ b/tmpfiles.d/etc.conf.m4
@@ -11,7 +11,7 @@ L /etc/os-release - - - - ../usr/lib/os-release
L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
L+ /etc/mtab - - - - ../proc/self/mounts
m4_ifdef(`ENABLE_RESOLVED',
-L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
+L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
)m4_dnl
C /etc/nsswitch.conf - - - -
m4_ifdef(`HAVE_PAM',