anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0015-fedora-disable-resolv.conf-symlink.patch

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