From 769af78b455a4c69e68c23f528ccdad0a9973fa0eec2781453d5544cb80196a5 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 6 Sep 2019 06:57:45 +0000 Subject: [PATCH] Accepting request 728691 from home:fbui:systemd:openSUSE-Factory - Track 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch in the git repo This patch has been in the quarantine area long enough, so let's move it in the git repo. OBS-URL: https://build.opensuse.org/request/show/728691 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1068 --- ...e-etc-resolv.conf-symlink-at-runtime.patch | 48 ------------------- systemd-mini.changes | 9 ++++ systemd-mini.spec | 1 - systemd.changes | 9 ++++ systemd.spec | 1 - 5 files changed, 18 insertions(+), 50 deletions(-) delete mode 100644 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch diff --git a/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch deleted file mode 100644 index 8f3549ad..00000000 --- a/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0c670fec00f3d5c103d9b7415d4e0510c61ad006 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime - -If the symlink doesn't exists, and we are being started, let's -create it to provie name resolution. - -If it exists, do nothing. In particular, if it is a broken symlink, -we cannot really know if the administator configured it to point to -a location used by some service that hasn't started yet, so we -don't touch it in that case either. - -https://bugzilla.redhat.com/show_bug.cgi?id=1313085 ---- - src/resolve/resolved.c | 4 ++++ - tmpfiles.d/etc.conf.m4 | 3 --- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index 2ca9fbdc72..3c8a9ff12a 100644 ---- a/src/resolve/resolved.c -+++ b/src/resolve/resolved.c -@@ -49,6 +49,10 @@ static int run(int argc, char *argv[]) { - /* Drop privileges, but only if we have been started as root. If we are not running as root we assume most - * privileges are already dropped. */ - if (getuid() == 0) { -+ r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); -+ if (r < 0 && errno != EEXIST) -+ log_warning_errno(errno, -+ "Could not create /etc/resolv.conf symlink: %m"); - - /* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */ - r = drop_privileges(uid, gid, -diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index f82e0b82ce..66a777bdb2 100644 ---- a/tmpfiles.d/etc.conf.m4 -+++ b/tmpfiles.d/etc.conf.m4 -@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts - m4_ifdef(`HAVE_SMACK_RUN_LABEL', - t /etc/mtab - - - - security.SMACK64=_ - )m4_dnl --m4_ifdef(`ENABLE_RESOLVE', --L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf --)m4_dnl - C! /etc/nsswitch.conf - - - - - m4_ifdef(`HAVE_PAM', - C! /etc/pam.d - - - - diff --git a/systemd-mini.changes b/systemd-mini.changes index f7fc44e9..4bc15b33 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 6 06:20:11 UTC 2019 - Franck Bui + +- Track 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + in the git repo + + This patch has been in the quarantine area long enough, so let's + move it in the git repo. + ------------------------------------------------------------------- Tue Sep 3 15:10:10 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 2e502eb5..7fe0bafa 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -165,7 +165,6 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description diff --git a/systemd.changes b/systemd.changes index f7fc44e9..4bc15b33 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Sep 6 06:20:11 UTC 2019 - Franck Bui + +- Track 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + in the git repo + + This patch has been in the quarantine area long enough, so let's + move it in the git repo. + ------------------------------------------------------------------- Tue Sep 3 15:10:10 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 92b17b4b..924d9771 100644 --- a/systemd.spec +++ b/systemd.spec @@ -163,7 +163,6 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description