X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=6bcf2e38dcaf51a88c601eff8e21f2779fa22faf;hb=3469e5df63fd3a9d4614d779d75cfa8787a3e54e;hp=24fcf4592140f923a7f089a328f9bf065487844d;hpb=6b7a68f13c328f74592f5397e362ff6cabe4f209;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
old mode 100755
new mode 100644
index 24fcf45..6bcf2e3
--- a/lxcsu
+++ b/lxcsu
@@ -3,11 +3,13 @@
 
 import setns
 import os
+import sys
 
-from optparse import OptionParser
+#from optparse import OptionParser
 
-drop_capabilities='cap_sys_admin,cap_net_admin,cap_sys_boot,cap_sys_module'
+drop_capabilities='cap_sys_admin,cap_net_admin,cap_sys_boot,cap_sys_module'.split(',')
 
+"""
 parser = OptionParser()
 parser.add_option("-n", "--net",
                   action="store_true", dest="netns", default=False,
@@ -20,6 +22,8 @@ parser.add_option("-p", "--pid",
                   help="Enter pid namespace")
 
 (options, args) = parser.parse_args()
+"""
+args = sys.argv[1:]
 
 try:
 	slice_name = args[0]
@@ -56,10 +60,29 @@ if (not slice_spec or not pid):
     print "Not started: %s"%slice_name
     exit(1)
 
+# Enter cgroups
+try:
+    for subsystem in ['cpuset','memory','fs','blkio']:
+        open('/sys/fs/cgroup/%s/libvirt/tasks'%subsystem,'w').write(pid)
+except:
+    print "Error assigning resources: %s"%slice_name
+    exit(1)
+
 r1 = setns.chcontext('/proc/%s/ns/utc'%pid)
 r2 = setns.chcontext('/proc/%s/ns/ipc'%pid)
 path = '/proc/%s/ns/net'%pid
 r3 = setns.chcontext(path)
+
 open('/proc/lxcsu','w').write(pid)
-#os.system('mount none -t proc /proc')
-os.execv('/usr/sbin/capsh',['--drop',drop_capabilities,'--'])
+open('/proc/pidsu','w').write(pid)
+
+
+
+pid = os.fork()
+
+cap_args = map(lambda c:'--drop='+c, drop_capabilities)
+    
+if (pid == 0):
+    os.execv('/usr/sbin/capsh',cap_args+['--']+args[1:])
+else:
+    os.waitpid(pid,0)