packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2160 from cgwalters/sysroot-ro 

remount: Still remount /sysroot writable if not configured ro
This commit is contained in:
OpenShift Merge Robot 2020-08-02 20:53:41 -04:00 committed by GitHub
parent 4fb5b8f85d 33eeb7b9eb
commit 9832a36a8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/switchroot/ostree-remount.c
View File

@ -106,11 +106,11 @@ main(int argc, char *argv[])
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
} }
/* Handle remounting /sysroot read-only now */ /* Handle remounting /sysroot; if it's explicitly marked as read-only (opt in)
if (unlink (_OSTREE_SYSROOT_READONLY_STAMP) == 0) * then ensure it's readonly, otherwise mount writable, the same as /
{ */
do_remount ("/sysroot", false); 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) /* 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. * then remounting the root mount read-only also remounted it.