You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
|
|
From 634aa6447d365af61b6cd78651eb80c32da966dc Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
|
|
Date: Fri, 3 Oct 2014 21:34:14 -0400
|
|
|
|
|
Subject: [PATCH] fedora: disable resolv.conf symlink
|
|
|
|
|
|
|
|
|
|
Conflicts:
|
|
|
|
|
tmpfiles.d/etc.conf.m4
|
|
|
|
|
---
|
|
|
|
|
tmpfiles.d/etc.conf.m4 | 3 ---
|
|
|
|
|
1 file changed, 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
|
|
|
|
|
index 9b0e080e6f..125d6e0a17 100644
|
|
|
|
|
--- a/tmpfiles.d/etc.conf.m4
|
|
|
|
|
+++ b/tmpfiles.d/etc.conf.m4
|
|
|
|
|
@@ -10,8 +10,5 @@
|
|
|
|
|
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
|
|
|
|
|
-)m4_dnl
|
|
|
|
|
C /etc/nsswitch.conf - - - -
|
|
|
|
|
C /etc/pam.d - - - -
|
