daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 634aa6447d365af61b6cd78651eb80c32da966dc Mon Sep 17 00:00:00 2001
803fb7
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
803fb7
Date: Fri, 3 Oct 2014 21:34:14 -0400
803fb7
Subject: [PATCH] fedora: disable resolv.conf symlink
803fb7
803fb7
Conflicts:
803fb7
	tmpfiles.d/etc.conf.m4
803fb7
---
803fb7
 tmpfiles.d/etc.conf.m4 | 3 ---
803fb7
 1 file changed, 3 deletions(-)
803fb7
803fb7
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
803fb7
index 9b0e080e6..125d6e0a1 100644
803fb7
--- a/tmpfiles.d/etc.conf.m4
803fb7
+++ b/tmpfiles.d/etc.conf.m4
803fb7
@@ -10,8 +10,5 @@
803fb7
 L /etc/os-release - - - - ../usr/lib/os-release
803fb7
 L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
803fb7
 L+ /etc/mtab - - - - ../proc/self/mounts
803fb7
-m4_ifdef(`ENABLE_RESOLVED',
803fb7
-L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
803fb7
-)m4_dnl
803fb7
 C /etc/nsswitch.conf - - - -
803fb7
 C /etc/pam.d - - - -