X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=560b9bfc75da4c5f8a172da7c6563d9d31c56583;hb=9e9a80a5705b59494bf9d0ad328976ea8ec137fd;hp=05899d2e5cbf5bc6db13be320324830928aed2ba;hpb=76027c89cb39489ae4a26cb919277c28d791ce3f;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
index 05899d2..560b9bf 100755
--- a/lxcsu
+++ b/lxcsu
@@ -1,66 +1,26 @@
 #!/usr/bin/python
 
-
-import setns
 import os
+import sys
 
-from optparse import OptionParser
-
-drop_capabilities='cap_sys_admin,cap_net_admin,cap_sys_boot,cap_sys_module'
-
-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")
-parser.add_option("-p", "--pid",
-                  action="store_true", dest="pidns", default=False,
-                  help="Enter pid 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
+LXCSU_INTERNAL='/usr/sbin/lxcsu-internal'
 
-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]
+def main ():
+    parser = ArgumentParser()
+    parser.add_argument ("slice_name")
+    parser.add_argument ("command_to_run",nargs="*")
 
-		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
+    options = parser.parse_args()
+    slice_name=options.slice_name
+    commands = options.command_to_run
+    if (not commands):
+        commands = ['/bin/sh']
 
-if (not slice_spec or not pid):
-    print "Not started: %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
-r3 = setns.chcontext(path)
+    exec_args = [LXCSU_INTERNAL,slice_name,'--']
+    exec_args+=commands
+    os.execv(LXCSU_INTERNAL,exec_args)
 
-open('/proc/lxcsu','w').write(pid)
-open('/proc/pidsu','w').write(pid)
-os.execv('/usr/sbin/capsh',['--drop',drop_capabilities,'--'])
+if __name__ == '__main__':
+    main()