shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-03 05:18:24 +03:00
Code Issues Projects Releases Wiki Activity

sysroot: Fix ostree in ostree nsenter

Browse Source
This commit is contained in:
Misaki Kasumi 2024-12-21 03:29:43 +08:00
parent 124035b36b
commit 2bd95ea855
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,6 +529,9 @@ _ostree_sysroot_ensure_visible (OstreeSysroot *self, GError **error)
return FALSE; return FALSE;
/* Because namespace is per-thread, there is no race here */ /* Because namespace is per-thread, there is no race here */
if (unshare (CLONE_NEWNS) < 0)
return glnx_throw_errno_prefix (error, "unshare");
if (setns (sysroot_ns_fd, CLONE_NEWNS) < 0) if (setns (sysroot_ns_fd, CLONE_NEWNS) < 0)
return glnx_throw_errno_prefix (error, "setns"); return glnx_throw_errno_prefix (error, "setns");
@ -562,11 +565,18 @@ _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;
glnx_autofd int cur_ns_fd = -1; gboolean in_root;
g_autofree char *cur_ns = g_strdup_printf ("/proc/%d/ns/mnt", gettid ()); if (!_ostree_in_root_mount_namespace (&in_root, error))
if (!glnx_openat_rdonly (AT_FDCWD, cur_ns, TRUE, &cur_ns_fd, 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;
@ -587,8 +597,11 @@ _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;
if (setns (cur_ns_fd, CLONE_NEWNS) < 0) if (in_root)
return glnx_throw_errno_prefix (error, "setns"); {
if (setns (cur_ns_fd, CLONE_NEWNS) < 0)
return glnx_throw_errno_prefix (error, "setns");
}
return TRUE; return TRUE;
} }