git://git.onelab.eu
/
lxc-userspace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set shell to /bin/sh. By default it is vsh
[lxc-userspace.git]
/
lxcsu
diff --git
a/lxcsu
b/lxcsu
index
b435b25
..
c076506
100644
(file)
--- a/
lxcsu
+++ b/
lxcsu
@@
-84,9
+84,6
@@
except:
exit(1)
r1 = setns.chcontext('/proc/%s/ns/uts'%pid)
exit(1)
r1 = setns.chcontext('/proc/%s/ns/uts'%pid)
-
-print pid
-
r2 = setns.chcontext('/proc/%s/ns/ipc'%pid)
r3 = setns.chcontext('/proc/%s/ns/net'%pid)
r2 = setns.chcontext('/proc/%s/ns/ipc'%pid)
r3 = setns.chcontext('/proc/%s/ns/net'%pid)
@@
-99,5
+96,6
@@
cap_args = map(lambda c:'--drop='+c, drop_capabilities)
if (pid == 0):
os.execv('/usr/sbin/capsh',cap_args+['--','--login']+args[1:])
if (pid == 0):
os.execv('/usr/sbin/capsh',cap_args+['--','--login']+args[1:])
+ os.environ['SHELL'] = '/bin/sh'
else:
os.waitpid(pid,0)
else:
os.waitpid(pid,0)