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

Merge pull request #2672 from cgwalters/initialize-sysroot-cleanups 

sysroot: Have `ensure_writable` also always initialize
This commit is contained in:
Colin Walters 2022-07-13 16:35:17 -04:00 committed by GitHub
parent 035b290210 75aa7a22f6
commit a3749efb1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.
*/ */