X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=c076506efb6ba93f27be867f93987496db3eaa11;hb=2e7dc22a9fb1f3cb3a0080126ce47c5e8fef9c47;hp=f794b888e775ed97c6d4d29e8389bbae8d1a54e2;hpb=054dd4db1d9176f6959d32792e00d0d15c7b3edc;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
index f794b88..c076506 100644
--- a/lxcsu
+++ b/lxcsu
@@ -7,7 +7,7 @@ import sys
 
 #from optparse import OptionParser
 
-drop_capabilities='cap_sys_admin,cap_net_admin,cap_sys_boot,cap_sys_module'.split(',')
+drop_capabilities='cap_sys_admin,cap_sys_boot,cap_sys_module'.split(',')
 
 """
 parser = OptionParser()
@@ -83,21 +83,19 @@ except:
     print "Error adding task to freezer cgroup. Slice is probably frozen: %s" % slice_name
     exit(1)
 
-r1 = setns.chcontext('/proc/%s/ns/utc'%pid)
+r1 = setns.chcontext('/proc/%s/ns/uts'%pid)
 r2 = setns.chcontext('/proc/%s/ns/ipc'%pid)
-path = '/proc/%s/ns/net'%pid
-r3 = setns.chcontext(path)
+r3 = setns.chcontext('/proc/%s/ns/net'%pid)
 
 open('/proc/lxcsu','w').write(pid)
 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:])
+    os.execv('/usr/sbin/capsh',cap_args+['--','--login']+args[1:])
+    os.environ['SHELL'] = '/bin/sh'
 else:
     os.waitpid(pid,0)