Simplify vsh, fix bug preventing bash arguments from being passed via ssh

[lxc-userspace.git] / lxcsu

diff --git a/lxcsu b/lxcsu
old mode 100755 (executable)
new mode 100644 (file)
index 67a6974..36cc5a5
--- 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_net_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,23 @@ for e in output:
        except:
                break
 
-if (not slice_spec):
-       print "Could not find any processes associated with %s"%slice_name
-
-
-#os.closerange(0,1024)
+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)
-os.system('whoami')
+
 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+['--']+args[1:])
+else:
+    os.waitpid(pid,0)