External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-21 19:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lxc_container: Turn lxcAttachNS into calling virProcessSetNamespaces

Browse Source 
Now that virProcessSetNamespaces() does accept FD list in the
correct format, we can simply turn lxcAttachNS into calling
virProcessSetNamespaces().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-08-27 02:59:29 +02:00
parent fb0ef0d511
commit 692e9fac75
1 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lxc/lxc_container.c
View File

@ -2184,25 +2184,9 @@ static int lxcContainerDropCapabilities(virDomainDefPtr def ATTRIBUTE_UNUSED,
*/
static int lxcAttachNS(int *ns_fd)
{
size_t i;
if (ns_fd)
for (i = 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) {
if (ns_fd[i] < 0)
continue;
VIR_DEBUG("Setting into namespace\n");
/* We get EINVAL if new NS is same as the current
* NS, or if the fd namespace doesn't match the
* type passed to setns()'s second param. Since we
* pass 0, we know the EINVAL is harmless
*/
if (setns(ns_fd[i], 0) < 0 &&
errno != EINVAL) {
virReportSystemError(errno, _("failed to set namespace '%s'"),
virLXCDomainNamespaceTypeToString(i));
return -1;
}
VIR_FORCE_CLOSE(ns_fd[i]);
}
if (ns_fd &&
virProcessSetNamespaces(VIR_LXC_DOMAIN_NAMESPACE_LAST, ns_fd) < 0)
return -1;
return 0;
}