Undo the resolv.conf workaround, Aim for a proper fix in Rawhide.

Do not merge this into F22 until other components are fixed (#1116651).

[See me reverting my reverts like a real weenie!]
This commit is contained in:
Michal Schmidt 2015-02-20 17:31:06 +01:00
parent 0cb630f4ff
commit 5427ee063b
2 changed files with 4 additions and 27 deletions

View File

@ -1,25 +0,0 @@
From a71b76adf62ed17838cf62a87e6c15724315b004 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
---
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

View File

@ -16,7 +16,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 219 Version: 219
Release: 4%{?gitcommit:.git%{gitcommit}}%{?dist} Release: 5%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager Summary: A System and Service Manager
@ -44,7 +44,6 @@ Source8: systemd-journal-gatewayd.xml
# kernel-install patch for grubby, drop if grubby is obsolete # kernel-install patch for grubby, drop if grubby is obsolete
Patch1000: kernel-install-grubby.patch 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);} %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
@ -863,6 +862,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
/usr/lib/firewalld/services/* /usr/lib/firewalld/services/*
%changelog %changelog
* Fri Feb 20 2015 Michal Schmidt <mschmidt@redhat.com> - 219-5
- Undo the resolv.conf workaround, Aim for a proper fix in Rawhide.
* Fri Feb 20 2015 Michal Schmidt <mschmidt@redhat.com> - 219-4 * Fri Feb 20 2015 Michal Schmidt <mschmidt@redhat.com> - 219-4
- Revive fedora-disable-resolv.conf-symlink.patch to unbreak composes. - Revive fedora-disable-resolv.conf-symlink.patch to unbreak composes.