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

sysroot: Have `ensure_writable` also always initialize 

For historical reasons we have a fair bit of distinct sysroot
initialization going on.  A lot of code is calling *just* the new
`ensure_writable()` API, which does basically what you'd expect...
except if we're not using a mount namespace.

Which is the case in unit tests and legacy setups.
Change this API to also ensure the sysroot is fully initialized
even in those cases.  Specifically we'll have `self->sysroot_fd`.

For now, callers that need `/boot` also need to separately
call `_ensure_boot_fd()`.
This commit is contained in:
Colin Walters 2022-07-13 15:35:00 -04:00
parent 7e7a3df99b
commit 75aa7a22f6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libostree/ostree-sysroot.c
View File

@ -328,14 +328,13 @@ gboolean
_ostree_sysroot_ensure_writable (OstreeSysroot *self, _ostree_sysroot_ensure_writable (OstreeSysroot *self,
GError **error) GError **error)
{ {
if (!ostree_sysroot_initialize (self, error))
return FALSE;
/* Do nothing if no mount namespace is in use */ /* Do nothing if no mount namespace is in use */
if (!self->mount_namespace_in_use) if (!self->mount_namespace_in_use)
return TRUE; return TRUE;
/* If a mount namespace is in use, ensure we're initialized */
if (!ostree_sysroot_initialize (self, error))
return FALSE;
/* If we aren't operating on a booted system, then we don't /* If we aren't operating on a booted system, then we don't
* do anything with mounts. * do anything with mounts.
*/ */