X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=8e0c8a6e084475cbc394e8107eec21002cc64e1b;hb=3d7cd7d5ae9f6938c8c2b4aec5e6756450fe0a6e;hp=ea63d1822234e6c9f2505c6983bf631aabf1cf49;hpb=5890874ae327145958ce7ad96ddc83441823ffb4;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
index ea63d18..8e0c8a6 100644
--- 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'.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,6 +60,15 @@ if (not slice_spec or not pid):
     print "Not started: %s"%slice_name
     exit(1)
 
+# Enter cgroups
+try:
+    for subsystem in ['cpuset','memory','blkio']:
+        open('/sys/fs/cgroup/%s/libvirt/lxc/%s/tasks'%(subsystem,slice_name),'w').write(str(os.getpid()))
+
+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
@@ -64,11 +77,13 @@ r3 = setns.chcontext(path)
 open('/proc/lxcsu','w').write(pid)
 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+['--'])
+    os.execv('/usr/sbin/capsh',cap_args+['--']+args[1:])
 else:
     os.waitpid(pid,0)