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

diff --git a/lxcsu b/lxcsu
index 67a6974..742fc83 100755
--- a/lxcsu
+++ b/lxcsu
@@ -1,64 +1,27 @@
 #!/usr/bin/python
 
-
-import setns
 import os
+import sys
 
-from optparse import OptionParser
-
-parser = OptionParser()
-parser.add_option("-n", "--net",
-                  action="store_true", dest="netns", default=False,
-                  help="Enter network namespace")
-parser.add_option("-m", "--mnt",
-                  action="store_true", dest="mntns", default=False,
-                  help="Enter mount namespace")
-
-(options, args) = parser.parse_args()
-
-try:
-	slice_name = args[0]
-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()
-except:
-	print "Error finding slice %s"%slice_name
-	exit(1)
+from argparse import ArgumentParser
 
-slice_spec = None
-for e in output:
-	try:
-		l = e.rstrip()
-		path = l.split(':')[0]	
-		comp = l.rsplit(':')[-1]
-		slice_name_check = comp.rsplit('/')[-1]
+LXCSU_INTERNAL='/usr/sbin/lxcsu-internal'
 
-		if (slice_name_check == slice_name):
-			slice_path = path
-			pid = slice_path.split('/')[2]
-			cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00')
-			if (cmdline == '/sbin/init'):
-				slice_spec = slice_path
-				break
-	except:
-		break
+def main ():
+    parser = ArgumentParser()
+    parser.add_argument ("slice_name")
+    parser.add_argument ("command_to_run",nargs="*")
 
-if (not slice_spec):
-	print "Could not find any processes associated with %s"%slice_name
+    options = parser.parse_args()
+    slice_name=options.slice_name
+    commands = options.command_to_run
+    if (not commands):
+        commands = ['/bin/sh']
 
 
-#os.closerange(0,1024)
+    exec_args = [LXCSU_INTERNAL,slice_name,'--','-c']
+    exec_args+=commands
+    os.execv(LXCSU_INTERNAL,exec_args)
 
-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')
-open('/proc/lxcsu','w').write(pid)
-os.system('mount none -t proc /proc')
-os.execv('/bin/sh',['/bin/sh'])
+if __name__ == '__main__':
+    main()