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
Remove kernel dependency, since this package does not contain any kernel modules
[lxc-userspace.git]
/
lxcsu
diff --git
a/lxcsu
b/lxcsu
index
f794b88
..
c076506
100644
(file)
--- a/
lxcsu
+++ b/
lxcsu
@@
-7,7
+7,7
@@
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(',')
+drop_capabilities='cap_sys_admin,cap_sys_boot,cap_sys_module'.split(',')
"""
parser = OptionParser()
"""
parser = OptionParser()
@@
-83,21
+83,19
@@
except:
print "Error adding task to freezer cgroup. Slice is probably frozen: %s" % slice_name
exit(1)
print "Error adding task to freezer cgroup. Slice is probably frozen: %s" % slice_name
exit(1)
-r1 = setns.chcontext('/proc/%s/ns/ut
c
'%pid)
+r1 = setns.chcontext('/proc/%s/ns/ut
s
'%pid)
r2 = setns.chcontext('/proc/%s/ns/ipc'%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)
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):
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)
else:
os.waitpid(pid,0)