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

diff --git a/lxcsu b/lxcsu
index 67a6974..05899d2 100755
--- a/lxcsu
+++ b/lxcsu
@@ -6,6 +6,8 @@ import os
 
 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,
@@ -13,6 +15,9 @@ 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()
 
@@ -22,7 +27,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 +52,15 @@ 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)
+os.execv('/usr/sbin/capsh',['--drop',drop_capabilities,'--'])