Merge pull request #2672 from cgwalters/initialize-sysroot-cleanups
sysroot: Have `ensure_writable` also always initialize
This commit is contained in:
1 file changed
+3
-4
@@ -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.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in new issue
Block a user