commit: f7b7b9f3e0df2c62e4724a7f44ce8ddd9c3e1084
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 06:30:09 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 15 06:31:34 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f7b7b9f3
catalyst: Mount squashfs with -o ro
Even though squashfs is not writeable, it must be mounted with -o ro in
order to be mounted multiple times. This allows, for example, the same
snapshot to be mounted simultaneously in multiple catalyst chroots.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 55d1032d..651bf4e4 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -868,7 +868,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
mount += ['-t', 'tmpfs', '-o', 'noexec,nosuid,nodev']
else:
source_path = Path(self.mount[x]['source'])
- if source_path.suffix != '.sqfs':
+ if source_path.suffix == '.sqfs':
+ mount += ['-o', 'ro']
+ else:
mount.append('--bind')
# We may need to create the source of the bind mount.
E.g., in the
