current/SOURCES/0001-remount-Still-remount-sysroot-writable-if-not-config.patch

From 33eeb7b9ebd858c0246a9155b7a64b9f8a258583 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 1 Aug 2020 17:24:28 +0000
Subject: [PATCH] remount: Still remount /sysroot writable if not configured ro

Regression from https://github.com/ostreedev/ostree/pull/2113/commits/35642259175973617da937f3cab6ce5f13c95077
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1862568

We still need to remount writable if it's not configured on;
because it may need OS adjustments it needs to be opt-in.
---
 src/switchroot/ostree-remount.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c
index 5c313c87..cfd270bb 100644
--- a/src/switchroot/ostree-remount.c
+++ b/src/switchroot/ostree-remount.c
@@ -106,11 +106,11 @@ main(int argc, char *argv[])
       exit (EXIT_SUCCESS);
     }
 
-  /* Handle remounting /sysroot read-only now */
-  if (unlink (_OSTREE_SYSROOT_READONLY_STAMP) == 0)
-    {
-      do_remount ("/sysroot", false);
-    }
+  /* Handle remounting /sysroot; if it's explicitly marked as read-only (opt in)
+   * then ensure it's readonly, otherwise mount writable, the same as /
+   */
+  bool sysroot_configured_readonly = unlink (_OSTREE_SYSROOT_READONLY_STAMP) == 0;
+  do_remount ("/sysroot", !sysroot_configured_readonly);
 
   /* If /var was created as as an OSTree default bind mount (instead of being a separate filesystem)
     * then remounting the root mount read-only also remounted it.
-- 
2.26.2

1	From 33eeb7b9ebd858c0246a9155b7a64b9f8a258583 Mon Sep 17 00:00:00 2001
2	From: Colin Walters <walters@verbum.org>
3	Date: Sat, 1 Aug 2020 17:24:28 +0000
4	Subject: [PATCH] remount: Still remount /sysroot writable if not configured ro
5
6	Regression from https://github.com/ostreedev/ostree/pull/2113/commits/35642259175973617da937f3cab6ce5f13c95077
7	BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1862568
8
9	We still need to remount writable if it's not configured on;
10	because it may need OS adjustments it needs to be opt-in.
11	---
12	src/switchroot/ostree-remount.c \| 10 +++++-----
13	1 file changed, 5 insertions(+), 5 deletions(-)
14
15	diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c
16	index 5c313c87..cfd270bb 100644
17	--- a/src/switchroot/ostree-remount.c
18	+++ b/src/switchroot/ostree-remount.c
19	@@ -106,11 +106,11 @@ main(int argc, char *argv[])
20	exit (EXIT_SUCCESS);
21	}
22
23	- /* Handle remounting /sysroot read-only now */
24	- if (unlink (_OSTREE_SYSROOT_READONLY_STAMP) == 0)
25	- {
26	- do_remount ("/sysroot", false);
27	- }
28	+ /* Handle remounting /sysroot; if it's explicitly marked as read-only (opt in)
29	+ * then ensure it's readonly, otherwise mount writable, the same as /
30	+ */
31	+ bool sysroot_configured_readonly = unlink (_OSTREE_SYSROOT_READONLY_STAMP) == 0;
32	+ do_remount ("/sysroot", !sysroot_configured_readonly);
33
34	/* If /var was created as as an OSTree default bind mount (instead of being a separate filesystem)
35	* then remounting the root mount read-only also remounted it.
36	--
37	2.26.2
38