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
commit a3749efb1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -328,14 +328,13 @@ gboolean
_ostree_sysroot_ensure_writable (OstreeSysroot *self,
GError **error)
{
if (!ostree_sysroot_initialize (self, error))
return FALSE;
/* Do nothing if no mount namespace is in use */
if (!self->mount_namespace_in_use)
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
* do anything with mounts.
*/