From 99d300dac00a7891b96de5542dd184e749dc478d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 28 2020 09:47:48 +0000
Subject: import ostree-2020.3-3.el8


---

diff --git a/.gitignore b/.gitignore
index 85081fc..dc39bc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libostree-2019.6.tar.xz
+SOURCES/libostree-2020.3.tar.xz
diff --git a/.ostree.metadata b/.ostree.metadata
index b1bf305..f991c97 100644
--- a/.ostree.metadata
+++ b/.ostree.metadata
@@ -1 +1 @@
-afdb1c1aa53a466962fb24f106c6560604c2c5be SOURCES/libostree-2019.6.tar.xz
+68a3ca414ddb14596ab92d170f43dabfa78f100e SOURCES/libostree-2020.3.tar.xz
diff --git a/SOURCES/0001-switchroot-remount-Neuter-sysroot.readonly-for-now.patch b/SOURCES/0001-switchroot-remount-Neuter-sysroot.readonly-for-now.patch
new file mode 100644
index 0000000..980dca9
--- /dev/null
+++ b/SOURCES/0001-switchroot-remount-Neuter-sysroot.readonly-for-now.patch
@@ -0,0 +1,33 @@
+From e35b82fb891daee823fcce421ae8f1442b630ea2 Mon Sep 17 00:00:00 2001
+From: Jonathan Lebon <jonathan@jlebon.com>
+Date: Wed, 20 May 2020 16:18:45 -0400
+Subject: [PATCH] switchroot/remount: Neuter sysroot.readonly for now
+
+We're hitting issues with the read-only remounts racing with various
+services coming up. Let's neuter it for now until we rework how it
+works.
+
+See: https://github.com/coreos/fedora-coreos-tracker/issues/488
+---
+ src/switchroot/ostree-remount.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c
+index 326b104f..00e21296 100644
+--- a/src/switchroot/ostree-remount.c
++++ b/src/switchroot/ostree-remount.c
+@@ -93,7 +93,10 @@ sysroot_is_configured_ro (void)
+   if (!g_key_file_load_from_file (keyfile, config_path, 0, NULL))
+     return false;
+ 
+-  return g_key_file_get_boolean (keyfile, "sysroot", "readonly", NULL);
++  if (g_key_file_get_boolean (keyfile, "sysroot", "readonly", NULL))
++    puts ("Ignoring sysroot.readonly config; see https://github.com/coreos/fedora-coreos-tracker/issues/488.");
++
++  return false;
+ }
+ 
+ int
+-- 
+2.25.4
+
diff --git a/SPECS/ostree.spec b/SPECS/ostree.spec
index f1d0f83..eab7d58 100644
--- a/SPECS/ostree.spec
+++ b/SPECS/ostree.spec
@@ -7,12 +7,14 @@
 
 Summary: Tool for managing bootable, immutable filesystem trees
 Name: ostree
-Version: 2019.6
-Release: 2%{?dist}
+Version: 2020.3
+Release: 3%{?dist}
 Source0: https://github.com/ostreedev/%{name}/releases/download/v%{version}/libostree-%{version}.tar.xz
 License: LGPLv2+
 URL: https://ostree.readthedocs.io/en/latest/
 
+Patch0: 0001-switchroot-remount-Neuter-sysroot.readonly-for-now.patch
+
 BuildRequires: git
 # We always run autogen.sh
 BuildRequires: autoconf automake libtool
@@ -162,6 +164,13 @@ find %{buildroot} -name '*.la' -delete
 %endif
 
 %changelog
+* Thu May 21 2020 Colin Walters <walters@verbum.org> - 2020.3-3
+- Backport https://github.com/ostreedev/ostree/pull/2108
+
+* Fri May 15 2020 Colin Walters <walters@verbum.org> - 2020.3-2
+- https://github.com/ostreedev/ostree/releases/tag/v2020.3
+  Resolves: #1836306
+
 * Tue Dec 10 2019 Colin Walters <walters@verbum.org> - 2019.6-2
 - https://github.com/ostreedev/ostree/releases/tag/v2019.6