ostree/SOURCES/0001-switchroot-remount-Neu...

34 lines
1.1 KiB
Diff

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