X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserverimpl.c;h=2c90f61d36781344bef3242ae6f4450dc717e6ba;hb=fa5203af07158455a1c35c311ec69c23c7702d2f;hp=5e28fa27dfd48a30858cc9e968214356b4363677;hpb=00ef3bf63bdc8011eea351d214dbeddcca050059;p=util-vserver-pl.git

diff --git a/python/vserverimpl.c b/python/vserverimpl.c
index 5e28fa2..2c90f61 100644
--- a/python/vserverimpl.c
+++ b/python/vserverimpl.c
@@ -612,7 +612,7 @@ vserver_mount(PyObject *self, PyObject *args)
 
   if (secure_chdir(&dirs, guest, target) == -1)
     goto out;
-  if (mount(source, ".", type, flags, data) == -1)
+  if (mount(source, ".", type, flags, data) == -1 && errno != EBUSY)
     goto out;
   restore_dirs(&dirs);
 
@@ -666,6 +666,39 @@ vserver_set_runlevel(PyObject *self, PyObject *args)
   return NONE;
 }
 
+static PyObject *
+vserver_set_name(PyObject *self, PyObject *args)
+{
+  xid_t       ctx, slice_id;
+  PyObject    *ret;
+
+  if (!PyArg_ParseTuple(args, "II", &ctx, &slice_id))
+    return NULL;
+
+  if (vc_set_vhi_name(ctx, vcVHI_CONTEXT, (char *)&slice_id, sizeof(slice_id)) != 0) {
+    return PyErr_SetFromErrno(PyExc_OSError);
+  } else {
+    return NONE;
+  }
+}
+
+static PyObject *
+vserver_get_name(PyObject *self, PyObject *args)
+{
+  xid_t       ctx, slice_id;
+  PyObject    *ret;
+
+  if (!PyArg_ParseTuple(args, "I", &ctx))
+    return NULL;
+
+  if (vc_get_vhi_name(ctx, vcVHI_CONTEXT, (char *)&slice_id, sizeof(slice_id)) !=0 ) {
+    ret = PyErr_SetFromErrno(PyExc_OSError);
+  } else {
+    ret = Py_BuildValue("i", slice_id);
+  }
+  return ret;
+}
+
 static PyMethodDef  methods[] = {
   { "chcontext", vserver_chcontext, METH_VARARGS,
     "chcontext to vserver with provided flags" },
@@ -705,6 +738,10 @@ static PyMethodDef  methods[] = {
     "Perform the umount2() system call" },
   { "setrunlevel", vserver_set_runlevel, METH_VARARGS,
     "Set the runlevel in utmp" },
+  { "setname", vserver_set_name, METH_VARARGS,
+    "Set the vcVHI_CONTEXT for a xid." },
+  { "getname", vserver_get_name, METH_VARARGS,
+    "Get the vcVHI_CONTEXT for a xid." },
   { NULL, NULL, 0, NULL }
 };