From 45c44c546975a3dfe0fb3ed56e7fd9d49fb0cabb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 04 2021 06:55:47 +0000 Subject: import ostree-2021.3-2.el8 --- diff --git a/SOURCES/0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch b/SOURCES/0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch new file mode 100644 index 0000000..583a482 --- /dev/null +++ b/SOURCES/0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch @@ -0,0 +1,34 @@ +From e6a560b40797324aa8b90e7100c6d50bff91f14d Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 30 Sep 2021 15:53:18 -0400 +Subject: [PATCH] deploy: Ignore sockets, fifos in /etc during merge + +https://bugzilla.redhat.com/show_bug.cgi?id=1945274 is an issue where a privileged +kubernetes daemonset is writing a socket into `/etc`. This makes ostree upgrades barf. + +Now, they should clearly move it to `/run`. However, one option is for us to +just ignore it instead of erroring out. Some brief investigation shows that +e.g. `git add somesocket` is a silent no-op, which is an argument in favor of ignoring it. + +Closes: https://github.com/ostreedev/ostree/issues/2446 +--- + src/libostree/ostree-sysroot-deploy.c | 4 +--- + tests/kolainst/destructive/staged-deploy.sh | 20 +++++++++++++++++++ + .../test-admin-deploy-etcmerge-cornercases.sh | 7 +++++++ + 3 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c +index 6a13a41b..a8bf9f44 100644 +--- a/src/libostree/ostree-sysroot-deploy.c ++++ b/src/libostree/ostree-sysroot-deploy.c +@@ -488,9 +488,7 @@ copy_modified_config_file (int orig_etc_fd, + } + else + { +- return glnx_throw (error, +- "Unsupported non-regular/non-symlink file in /etc '%s'", +- path); ++ ot_journal_print (LOG_INFO, "Ignoring non-regular/non-symlink file found during /etc merge: %s", path); + } + + return TRUE; diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec index e5db843..5381d79 100644 --- a/SPECS/ostree.spec +++ b/SPECS/ostree.spec @@ -8,11 +8,16 @@ Summary: Tool for managing bootable, immutable filesystem trees Name: ostree Version: 2021.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz License: LGPLv2+ URL: https://ostree.readthedocs.io/en/latest/ +# https://github.com/ostreedev/ostree/pull/2453/commits/e6a560b40797324aa8b90e7100c6d50bff91f14d +# https://bugzilla.redhat.com/show_bug.cgi?id=2027788 +# https://bugzilla.redhat.com/show_bug.cgi?id=1945274 +Patch0: 0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch + BuildRequires: make BuildRequires: git # We always run autogen.sh @@ -163,6 +168,11 @@ find %{buildroot} -name '*.la' -delete %endif %changelog +* Tue Nov 30 2021 Colin Walters - 2021.3-2 +- Backport + https://github.com/ostreedev/ostree/pull/2453/commits/e6a560b40797324aa8b90e7100c6d50bff91f14d + Resolves: rhbz#2027788 + * Tue Jul 20 2021 Luca BRUNO - 2021.3-1 - New upstream version https://github.com/ostreedev/ostree/releases/tag/v2021.3