From: Colin Walters <walters@verbum.org>
Date: Sat, 1 Aug 2020 17:24:28 +0000 (+0000)
Subject: remount: Still remount /sysroot writable if not configured ro
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~9^2~9^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=33eeb7b9ebd858c0246a9155b7a64b9f8a258583;p=ostree.git

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.
---

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.