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

diff --git a/lxcsu b/lxcsu
old mode 100755
new mode 100644
index 24fcf45..7a4ed1b
--- a/lxcsu
+++ b/lxcsu
@@ -3,11 +3,18 @@
 
 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_sys_boot,cap_sys_module'
 
+def umount(fs_dir):
+    output = os.popen('/bin/umount %s 2>&1'%fs_dir).read()
+    return ('device is busy' not in fs_dir)
+
+
+"""
 parser = OptionParser()
 parser.add_option("-n", "--net",
                   action="store_true", dest="netns", default=False,
@@ -20,6 +27,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 +65,64 @@ if (not slice_spec or not pid):
     print "Not started: %s"%slice_name
     exit(1)
 
-r1 = setns.chcontext('/proc/%s/ns/utc'%pid)
+# 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)
+
+try:
+    open('/sys/fs/cgroup/cpuacct/system/libvirtd.service/libvirt/lxc/%s/tasks'%slice_name,'w').write(str(os.getpid()))
+except:
+    print "Error assigning cpuacct: %s" % slice_name
+    exit(1)
+
+# If the slice is frozen, then we'll get an EBUSY when trying to write to the task
+# list for the freezer cgroup. Since the user couldn't do anything anyway, it's best
+# in this case to error out the shell. (an alternative would be to un-freeze it,
+# add the task, and re-freeze it)
+try:
+    f=open('/sys/fs/cgroup/freezer/libvirt/lxc/%s/tasks'%(slice_name),'w')
+    f.write(str(os.getpid()))
+    # note: we need to call f.close() explicitly, or we'll get an exception in
+    # the object destructor, which will not be caught
+    f.close()
+except:
+    print "Error adding task to freezer cgroup. Slice is probably frozen: %s" % slice_name
+    exit(1)
+
+r1 = setns.chcontext('/proc/%s/ns/uts'%pid)
 r2 = setns.chcontext('/proc/%s/ns/ipc'%pid)
-path = '/proc/%s/ns/net'%pid
-r3 = setns.chcontext(path)
+r3 = setns.chcontext('/proc/%s/ns/net'%pid)
+
 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)
+
+# cgroups is not yet LXC-safe, so we need to use the course grained access control
+# strategy of unmounting the filesystem
+
+umount_result = True
+for subsystem in ['cpuset','cpu,cpuacct','memory','devices','freezer','net_cls','blkio','perf_event']:
+    fs_path = '/sys/fs/cgroup/%s'%subsystem
+    if (not umount(fs_path)):
+        print "Error disabling cgroup access"
+        exit(1)
+
+if (not umount('/sys/fs/cgroup')):
+    print "Error disabling cgroup access"
+    exit(1)
+
+pid = os.fork()
+
+if (pid == 0):
+    cap_arg = '--drop='+drop_capabilities
+    exec_args = ['/usr/sbin/capsh',cap_arg,'--','--login']+args[1:]
+
+    os.environ['SHELL'] = '/bin/sh'
+    os.execv('/usr/sbin/capsh',exec_args)
+else:
+    _,status = os.waitpid(pid,0)
+    exit(os.WEXITSTATUS(status))