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

diff --git a/lxcsu b/lxcsu
index 8e0c8a6..eae5225 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()
@@ -69,6 +69,20 @@ except:
     print "Error assigning resources: %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/utc'%pid)
 r2 = setns.chcontext('/proc/%s/ns/ipc'%pid)
 path = '/proc/%s/ns/net'%pid