From 4dd25f856a023f39f80a6c21040affb36cd230d8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Aug 22 2014 02:15:40 +0000 Subject: Re-add patch to disable resolve.conf symlink --- diff --git a/0001-resolved-Move-symlink-creation-from-tmpfiles-to-daem.patch b/0001-resolved-Move-symlink-creation-from-tmpfiles-to-daem.patch new file mode 100644 index 0000000..8cb516a --- /dev/null +++ b/0001-resolved-Move-symlink-creation-from-tmpfiles-to-daem.patch @@ -0,0 +1,32 @@ +From 73403e8de2c5bc6d54f89ae2f1c9aa12b92ecb7a Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 7 Jul 2014 08:27:43 -0400 +Subject: [PATCH] resolved: Move symlink creation from tmpfiles to daemon + runtime + +At least Fedora right now doesn't by default use resolved; the service +is disabled by default in the 90-default.preset file. + +The change to unconditionally create the resolv.conf symlink broke +Anaconda and related tools (lorax) which expect it to be a regular +file. In particular, Anaconda expects to be able to persist +networking state from the installation environment to the target +system. +--- + tmpfiles.d/etc.conf | 1 - + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/tmpfiles.d/etc.conf b/tmpfiles.d/etc.conf +index b23272cb27..125d6e0a17 100644 +--- a/tmpfiles.d/etc.conf ++++ b/tmpfiles.d/etc.conf +@@ -10,6 +10,5 @@ + L /etc/os-release - - - - ../usr/lib/os-release + L /etc/localtime - - - - ../usr/share/zoneinfo/UTC + L+ /etc/mtab - - - - ../proc/self/mounts +-L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf + C /etc/nsswitch.conf - - - - + C /etc/pam.d - - - - +-- +1.9.3 + diff --git a/systemd.spec b/systemd.spec index 87e0167..c6673f5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,7 +16,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 216 -Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -38,6 +38,11 @@ Source6: yum-protect-systemd.conf # GIT_DIR=~/src/systemd/.git git format-patch-ab -M -N --no-signature v215..v215-stable # i=1; for p in 0*patch;do printf "Patch%03d: %s\n" $i $p; ((i++));done +# Presently not accepted upstream, but we disable systemd-resolved in +# the presets anyways, and this unbreaks anaconda/lorax/livecd-creator +# etc. +Patch0: 0001-resolved-Move-symlink-creation-from-tmpfiles-to-daem.patch + # kernel-install patch for grubby, drop if grubby is obsolete Patch1000: kernel-install-grubby.patch @@ -799,6 +804,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd %{_datadir}/systemd/gatewayd %changelog +* Thu Aug 21 2014 Zbigniew Jędrzejewski-Szmek - 216-2 +- Re-add patch to disable resolve.conf symlink (#1043119) + * Wed Aug 20 2014 Lennart Poettering - 216-1 - New upstream release