anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

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

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