X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=b435b25e72cf54ff33ccea2c669fcf8d60ffd9ef;hb=85e4e9d38a2670da7c66178d629a71d2f3caa901;hp=229cb33d0fa6095f4e73411d639e70e57b91eb5f;hpb=9e57ef001f206b31efbfe5f8398d231c9928c29e;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
index 229cb33..b435b25 100644
--- a/lxcsu
+++ b/lxcsu
@@ -7,7 +7,7 @@ import sys
 
 #from optparse import OptionParser
 
-drop_capabilities='cap_sys_admin,cap_net_admin,cap_sys_boot,cap_sys_module'.split(',')
+drop_capabilities='cap_sys_admin,cap_sys_boot,cap_sys_module'.split(',')
 
 """
 parser = OptionParser()
@@ -63,26 +63,41 @@ if (not slice_spec or not pid):
 # Enter cgroups
 try:
     for subsystem in ['cpuset','memory','blkio']:
-        open('/sys/fs/cgroup/%s/libvirt/tasks'%subsystem,'w').write(pid)
+        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)
+# 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)
+
+print 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)
 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:])
+    os.execv('/usr/sbin/capsh',cap_args+['--','--login']+args[1:])
 else:
     os.waitpid(pid,0)