rpms
/
ostree
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import ostree-2022.1-2.el8

This commit is contained in:
CentOS Sources 2022-05-10 03:06:40 -04:00 committed by Stepan Oksanichenko
parent 0072f33e78
commit 751273bd85
4 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libostree-2021.3.tar.xz
SOURCES/libostree-2022.1.tar.xz

2
.ostree.metadata
View File

@ -1 +1 @@
b8a32cd735b2abccb72464ea33806e4944b0440e SOURCES/libostree-2021.3.tar.xz
31380c30eeb93de7d9850fa8a071b3fbc3f3acee SOURCES/libostree-2022.1.tar.xz

34
SOURCES/0001-deploy-Ignore-sockets-fifos-in-etc-during-merge.patch
View File

@ -1,34 +0,0 @@
From e6a560b40797324aa8b90e7100c6d50bff91f14d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
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;

17
SPECS/ostree.spec
View File

@ -7,17 +7,12 @@
Summary: Tool for managing bootable, immutable filesystem trees
Name: ostree
Version: 2021.3
Version: 2022.1
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
@ -168,10 +163,18 @@ find %{buildroot} -name '*.la' -delete
%endif
%changelog
* Mon Jan 10 2022 Colin Walters <walters@verbum.org> - 2022.1-2
- Rebase to 2022.1
Resolves: rhbz#2032593
* Wed Dec 15 2021 Colin Walters <walters@verbum.org> - 2021.6-2
- Rebase to 2021.6
Resolves: rhbz#2032593
* Tue Nov 30 2021 Colin Walters <walters@verbum.org> - 2021.3-2
- Backport
https://github.com/ostreedev/ostree/pull/2453/commits/e6a560b40797324aa8b90e7100c6d50bff91f14d
Resolves: rhbz#2029578
Resolves: rhbz#2027788
* Tue Jul 20 2021 Luca BRUNO <lucab@redhat.com> - 2021.3-1
- New upstream version