shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

sysroot: Tidy code for _ostree_sysroot_ensure_writable

Browse Source
This commit is contained in:
Misaki Kasumi 2024-12-21 14:31:22 +08:00
parent 04d36fafb1
commit 2960f0a304
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,14 +569,6 @@ _ostree_sysroot_ensure_writable (OstreeSysroot *self, GError **error)
if (!_ostree_in_root_mount_namespace (&in_root, error)) if (!_ostree_in_root_mount_namespace (&in_root, error))
return FALSE; return FALSE;
glnx_autofd int cur_ns_fd = -1;
if (in_root)
{
g_autofree char *cur_ns = g_strdup_printf ("/proc/%d/ns/mnt", gettid ());
if (!glnx_openat_rdonly (AT_FDCWD, cur_ns, TRUE, &cur_ns_fd, error))
return FALSE;
}
if (!_ostree_sysroot_enter_mount_namespace (self, error)) if (!_ostree_sysroot_enter_mount_namespace (self, error))
return FALSE; return FALSE;
@ -597,9 +589,15 @@ _ostree_sysroot_ensure_writable (OstreeSysroot *self, GError **error)
if (!_ostree_sysroot_ensure_boot_fd (self, error)) if (!_ostree_sysroot_ensure_boot_fd (self, error))
return FALSE; return FALSE;
/* Switch back */
if (in_root) if (in_root)
{ {
if (setns (cur_ns_fd, CLONE_NEWNS) < 0) glnx_autofd int root_ns_fd = -1;
if (!glnx_openat_rdonly (AT_FDCWD, "/proc/1/ns/mnt", TRUE, &root_ns_fd, error))
return FALSE;
if (setns (root_ns_fd, CLONE_NEWNS) < 0)
return glnx_throw_errno_prefix (error, "setns"); return glnx_throw_errno_prefix (error, "setns");
} }