[systemd] Revive fedora-disable-resolv.conf-symlink.patch to unbreak composes

[Michal Schmidt]

commit 0cb630f4ff289cbba7c646627526cb15dfc867b7
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Fri Feb 20 14:18:42 2015 +0100

    Revive fedora-disable-resolv.conf-symlink.patch to unbreak composes

 fedora-disable-resolv.conf-symlink.patch | 25 +++++++++++++++++++++++++
 systemd.spec                             |  6 +++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/fedora-disable-resolv.conf-symlink.patch b/fedora-disable-resolv.conf-symlink.patch
new file mode 100644
index 0000000..befae17
--- /dev/null
+++ b/fedora-disable-resolv.conf-symlink.patch
@@ -0,0 +1,25 @@
+From a71b76adf62ed17838cf62a87e6c15724315b004 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Fri, 3 Oct 2014 21:34:14 -0400
+Subject: [PATCH] fedora: disable resolv.conf symlink
+
+---
+ 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 9b0e080..125d6e0 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 - - - -
+-- 
+2.3.0
+
diff --git a/systemd.spec b/systemd.spec
index d34eb67..d56de92 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        219
-Release:        3%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        4%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -44,6 +44,7 @@ Source8:        systemd-journal-gatewayd.xml
 
 # kernel-install patch for grubby, drop if grubby is obsolete
 Patch1000:      kernel-install-grubby.patch
+Patch1001:      fedora-disable-resolv.conf-symlink.patch
 
 %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
 
@@ -862,6 +863,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 /usr/lib/firewalld/services/*
 
 %changelog
+* Fri Feb 20 2015 Michal Schmidt <mschmidt at redhat.com> - 219-4
+- Revive fedora-disable-resolv.conf-symlink.patch to unbreak composes.
+
 * Wed Feb 18 2015 Michal Schmidt <mschmidt at redhat.com> - 219-3
 - arm: disabling gold did not help; disable lto instead (#1193212)