From 942c9accc4497d079c2ef62ee657f655b91b9c9c8407f1aefd85f7a5136a5920 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Tue, 19 Jun 2018 09:53:47 +0000 Subject: [PATCH] Accepting request 616862 from Base:System OBS-URL: https://build.opensuse.org/request/show/616862 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=281 --- ...e-etc-resolv.conf-symlink-at-runtime.patch | 53 +++++++++++++++++++ systemd-mini.changes | 18 +++++++ systemd-mini.spec | 12 +++-- systemd-v237+suse.57.gd81968050.tar.xz | 3 -- systemd-v237+suse.64.gf63623c1f.tar.xz | 3 ++ systemd.changes | 18 +++++++ systemd.spec | 12 +++-- 7 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch delete mode 100644 systemd-v237+suse.57.gd81968050.tar.xz create mode 100644 systemd-v237+suse.64.gf63623c1f.tar.xz diff --git a/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch new file mode 100644 index 00000000..09c040f2 --- /dev/null +++ b/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -0,0 +1,53 @@ +From a482b51673d4344faf76a0460a69d7f273b36e47 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 1/1] 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 + +[fbui: fixes boo#1024897] +--- + 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 a4cda0b5e..68bca8077 100644 +--- a/src/resolve/resolved.c ++++ b/src/resolve/resolved.c +@@ -71,6 +71,10 @@ int main(int argc, char *argv[]) { + /* Drop privileges, but only if we have been started as root. If we are not running as root we assume all + * 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 df8d42101..928105ea8 100644 +--- a/tmpfiles.d/etc.conf.m4 ++++ b/tmpfiles.d/etc.conf.m4 +@@ -13,9 +13,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 - - - - +-- +2.16.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 872d187a..57ee268c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jun 13 13:29:59 UTC 2018 - fbui@suse.com + +- Import commit f63623c1fc0eb01b8efc2037d004f42ed8328356 + + 6a161916f device: make sure to always retroactively start device dependencies (take #2) (bsc#1088052) + e4402648c Fix pattern to detect distribution + ad59c7970 install: "user" and "global" scopes are equivalent for user presets (boo#1093851) + b1876c81a rpm: remove confusing --user before --global + 00ea8a214 man: updated systemd-analyze blame description for service-units with Type=simple (#8834) (bsc#1091265) + a9b587e2f fileio.c: fix incorrect mtime + +------------------------------------------------------------------- +Tue Jun 12 13:38:23 UTC 2018 - fbui@suse.com + +- Add 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (boo#1024897) +- Ship systemd-resolved (but disabled by default) (bsc#1018387) + ------------------------------------------------------------------- Fri May 18 08:39:41 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 5bfad6f2..294b59e4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.57.gd81968050 +%define suse_version +suse.64.gf63623c1f %bcond_with gnuefi %if 0%{?bootstrap} @@ -34,18 +34,19 @@ %bcond_with machined %bcond_with importd %bcond_with networkd +%bcond_with resolved %bcond_with journal_remote %else %bcond_without sysvcompat %bcond_without machined %bcond_without importd %bcond_without networkd +%bcond_without resolved %bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif %endif -%bcond_with resolved %bcond_with parentpathid Name: systemd-mini @@ -162,6 +163,7 @@ Source1002: 99-wakeup-from-idle.rules # 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 %description Systemd is a system and service manager, compatible with SysV and LSB @@ -424,7 +426,7 @@ systemd-journal-remote, and systemd-journal-upload. %prep %setup -q -n systemd-v%{version}%{suse_version} -# %%autopatch -p1 +%autopatch -p1 %build opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) @@ -1010,7 +1012,6 @@ fi %if %{with journal_remote} %exclude %{_sysusersdir}/systemd-remote.conf -%exclude %{_tmpfilesdir}/systemd-remote.conf %endif %{_libexecdir}/environment.d/ @@ -1111,6 +1112,9 @@ fi %if %{with networkd} %{_datadir}/polkit-1/rules.d/systemd-networkd.rules %endif +%if %{with resolved} +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* diff --git a/systemd-v237+suse.57.gd81968050.tar.xz b/systemd-v237+suse.57.gd81968050.tar.xz deleted file mode 100644 index 963d977f..00000000 --- a/systemd-v237+suse.57.gd81968050.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c92c0a8012c1b5b7a2866854ecdbcffca697d5cb65df43ad6a7a2859c95915e -size 4627256 diff --git a/systemd-v237+suse.64.gf63623c1f.tar.xz b/systemd-v237+suse.64.gf63623c1f.tar.xz new file mode 100644 index 00000000..f9cd526d --- /dev/null +++ b/systemd-v237+suse.64.gf63623c1f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8e33fbc2e480712d72fbb01548c9f3a4f6f9257b55772a58398ec3d0c63b47f +size 4627420 diff --git a/systemd.changes b/systemd.changes index 872d187a..57ee268c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jun 13 13:29:59 UTC 2018 - fbui@suse.com + +- Import commit f63623c1fc0eb01b8efc2037d004f42ed8328356 + + 6a161916f device: make sure to always retroactively start device dependencies (take #2) (bsc#1088052) + e4402648c Fix pattern to detect distribution + ad59c7970 install: "user" and "global" scopes are equivalent for user presets (boo#1093851) + b1876c81a rpm: remove confusing --user before --global + 00ea8a214 man: updated systemd-analyze blame description for service-units with Type=simple (#8834) (bsc#1091265) + a9b587e2f fileio.c: fix incorrect mtime + +------------------------------------------------------------------- +Tue Jun 12 13:38:23 UTC 2018 - fbui@suse.com + +- Add 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (boo#1024897) +- Ship systemd-resolved (but disabled by default) (bsc#1018387) + ------------------------------------------------------------------- Fri May 18 08:39:41 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index c356ee33..b5889757 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.57.gd81968050 +%define suse_version +suse.64.gf63623c1f %bcond_with gnuefi %if 0%{?bootstrap} @@ -32,18 +32,19 @@ %bcond_with machined %bcond_with importd %bcond_with networkd +%bcond_with resolved %bcond_with journal_remote %else %bcond_without sysvcompat %bcond_without machined %bcond_without importd %bcond_without networkd +%bcond_without resolved %bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif %endif -%bcond_with resolved %bcond_with parentpathid Name: systemd @@ -160,6 +161,7 @@ Source1002: 99-wakeup-from-idle.rules # 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 %description Systemd is a system and service manager, compatible with SysV and LSB @@ -422,7 +424,7 @@ systemd-journal-remote, and systemd-journal-upload. %prep %setup -q -n systemd-v%{version}%{suse_version} -# %%autopatch -p1 +%autopatch -p1 %build opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) @@ -1008,7 +1010,6 @@ fi %if %{with journal_remote} %exclude %{_sysusersdir}/systemd-remote.conf -%exclude %{_tmpfilesdir}/systemd-remote.conf %endif %{_libexecdir}/environment.d/ @@ -1109,6 +1110,9 @@ fi %if %{with networkd} %{_datadir}/polkit-1/rules.d/systemd-networkd.rules %endif +%if %{with resolved} +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1*