shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-06 00:58:44 +03:00
Code Issues Projects Releases Wiki Activity

prepare-root: Don't parse target root when composefs enabled

Browse Source 
We shouldn't load anything from the target root filesystem *before*
verifying its integrity if composefs is enabled.

In effect, we want to force composefs users to migrate to
`/usr/lib/ostree/prepare-root.conf` which lives in the initramfs.
(But because we enable sysroot.readonly=true if composefs is enabled
 too, they don't actually need to)
This commit is contained in:
Colin Walters 2023-07-23 14:39:04 -04:00
parent 83d37d6d3c
commit 3465626015
1 changed files with 3 additions and 1 deletions

4
src/switchroot/ostree-prepare-root.c

@ -376,8 +376,10 @@ main (int argc, char *argv[])
/* Fall back to querying the repository configuration in the target disk.
* This is an operating system builder choice. More info:
* https://github.com/ostreedev/ostree/pull/1767
* However, we only do this if composefs is not enabled, because we don't
* want to parse the target root filesystem before verifying its integrity.
*/
if (!sysroot_readonly)
if (!sysroot_readonly && composefs_config->enabled != OT_TRISTATE_YES)
{
sysroot_readonly = sysroot_is_configured_ro (root_arg);
// Encourage porting to the new config file