X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=b435b25e72cf54ff33ccea2c669fcf8d60ffd9ef;hb=9d2cdcc0d2722975477b6a5368514bc6fcb21c62;hp=67a697482b66eea70eeba590d120a012b10d8174;hpb=8f0e621ac168f3374ee3956426a840caa79d36d6;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
old mode 100755
new mode 100644
index 67a6974..b435b25
--- a/lxcsu
+++ b/lxcsu
@@ -3,9 +3,13 @@
 
 import setns
 import os
+import sys
 
-from optparse import OptionParser
+#from optparse import OptionParser
 
+drop_capabilities='cap_sys_admin,cap_sys_boot,cap_sys_module'.split(',')
+
+"""
 parser = OptionParser()
 parser.add_option("-n", "--net",
                   action="store_true", dest="netns", default=False,
@@ -13,8 +17,13 @@ parser.add_option("-n", "--net",
 parser.add_option("-m", "--mnt",
                   action="store_true", dest="mntns", default=False,
                   help="Enter mount namespace")
+parser.add_option("-p", "--pid",
+                  action="store_true", dest="pidns", default=False,
+                  help="Enter pid namespace")
 
 (options, args) = parser.parse_args()
+"""
+args = sys.argv[1:]
 
 try:
 	slice_name = args[0]
@@ -22,7 +31,6 @@ except IndexError:
 	print "You must specify a vm name"
 	exit(1)
 
-
 try:
 	cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name
 	output = os.popen(cmd).readlines()
@@ -48,17 +56,48 @@ for e in output:
 	except:
 		break
 
-if (not slice_spec):
-	print "Could not find any processes associated with %s"%slice_name
+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)
+
+# 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)
 
-#os.closerange(0,1024)
+print pid
 
-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)
-os.system('whoami')
+r3 = setns.chcontext('/proc/%s/ns/net'%pid)
+
 open('/proc/lxcsu','w').write(pid)
-os.system('mount none -t proc /proc')
-os.execv('/bin/sh',['/bin/sh'])
+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+['--','--login']+args[1:])
+else:
+    os.waitpid(pid,0)