X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=setns.c;h=e82bd261df077c8137a1056d8ebc63dceb5ad02f;hb=bc916290e9e64b040b6c063b733c5fc63efca7c6;hp=323825a8d3237ba96a0cf19f92a7ca2bf334545c;hpb=8f0e621ac168f3374ee3956426a840caa79d36d6;p=lxc-userspace.git

diff --git a/setns.c b/setns.c
index 323825a..e82bd26 100644
--- a/setns.c
+++ b/setns.c
@@ -1,7 +1,8 @@
 #include <Python.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <asm-generic/unistd.h>
+#include <asm/unistd.h>
+#include <sys/mount.h>
 
 static PyObject *
 chfscontext(PyObject *self, PyObject *args)
@@ -14,12 +15,11 @@ chfscontext(PyObject *self, PyObject *args)
 
     int fd = open(filepath, O_RDONLY);
     if (fd < 0) {
-	printf("Could not open ns file\n");
         sts = -1;
         goto out;
     }
     
-    if (setns(fd, 666)) {
+    if (setns(fd, 0)) {
         sts = -1;
     }
     close(fd);
@@ -27,6 +27,26 @@ chfscontext(PyObject *self, PyObject *args)
 out:
     return Py_BuildValue("i", sts);
 }
+
+static PyObject *
+proc_mount(PyObject *self, PyObject *args)
+{
+    int sts; 
+    sts = mount("none","/proc","proc",0,NULL);
+
+    return Py_BuildValue("i", sts);
+}
+
+static PyObject *
+proc_umount(PyObject *self, PyObject *args)
+{
+    int sts; 
+    sts = umount("/proc");
+
+    return Py_BuildValue("i", sts);
+
+}
+
 static PyObject *
 chcontext(PyObject *self, PyObject *args)
 {
@@ -38,7 +58,6 @@ chcontext(PyObject *self, PyObject *args)
 
     int fd = open(filepath, O_RDONLY);
     if (fd < 0) {
-	printf("Could not open ns file\n");
         sts = -1;
         goto out;
     }
@@ -54,6 +73,8 @@ out:
 
 static PyMethodDef SetnsMethods[] =
 {
+         {"proc_mount", proc_mount, METH_VARARGS, "Mount a volume via the mount system call."},
+         {"proc_umount", proc_umount, METH_VARARGS, "Umount a volume via the umount system call."},
          {"chcontext", chcontext, METH_VARARGS, "Switch into an lxc container."},
          {"chfscontext", chfscontext, METH_VARARGS, "Switch into an lxc container."},
               {NULL, NULL, 0, NULL}