def getarch(f):
output = os.popen('readelf -h %s 2>&1'%f).readlines()
- if debug: print "readelf output %s lines"%len(output)
classlines = [x for x in output if ('Class' in x.split(':')[0])]
line = classlines[0]
c = line.split(':')[1]
def umount(fs_dir):
output = os.popen('/bin/umount %s 2>&1'%fs_dir).read()
- return ('device is busy' not in fs_dir)
+ return ('device is busy' not in output)
def main ():
parser = ArgumentParser()
parser.add_argument ("slice_name")
parser.add_argument ("command_to_run",nargs="*")
- options = parser.parse_args()
- slice_name=options.slice_name
- global debug
- debug=options.debug
+ args = parser.parse_args()
+ slice_name=args.slice_name
+ # support for either setting debug at the top of this file, or on the command-line
+ if args.debug:
+ global debug
+ debug=True
try:
cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name
output = os.popen(cmd).readlines()
- if debug: print "output of grep freezer has %s lines"%len(output)
+# if debug: print "output of grep freezer has %s lines"%len(output)
except:
print "Error finding slice %s"%slice_name
exit(1)
slice_path = path
pid = slice_path.split('/')[2]
cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00')
- if (cmdline == '/sbin/init'):
+ if (cmdline == '/sbin/init') or (cmdline.startswith("init [")):
slice_spec = slice_path
arch = getarch('/proc/%s/exe'%pid)
- if debug: print "setting arch",arch
break
except Exception,e:
if debug:
if arch is None:
arch = 'x86_64'
- if debug: print "WARNING: setting arch to default x86_64"
+ # Set sysctls specific to slice
+ sysctl_dir = '/etc/planetlab/vsys-attributes/%s'%slice_name
+ if (os.access(sysctl_dir,0)):
+ entries = os.listdir(sysctl_dir)
+ for e in entries:
+ prefix = 'vsys_sysctl.'
+ if (e.startswith(prefix)):
+ sysctl_file = '/'.join([sysctl_dir,e])
+ sysctl_name = e[len(prefix):]
+ sysctl_val = open(sysctl_file).read()
+ os.system('sysctl -w %s=%s'%(sysctl_name,sysctl_val))
+
# Enter cgroups
try:
for subsystem in ['cpuset','memory','blkio']:
setns.chcontext('/proc/%s/ns/uts'%pid)
setns.chcontext('/proc/%s/ns/ipc'%pid)
+
+ if (not args.pidns):
+ setns.chcontext('/proc/%s/ns/pid'%pid)
- if (not options.netns):
+ if (not args.netns):
setns.chcontext('/proc/%s/ns/net'%pid)
- if (not options.mntns):
+ if (not args.mntns):
setns.chcontext('/proc/%s/ns/mnt'%pid)
- if (not options.pidns):
- setns.chcontext('/proc/%s/ns/pid'%pid)
+
+ proc_mounted = False
if (not os.access('/proc/self',0)):
+ proc_mounted = True
setns.proc_mount()
+
+
# cgroups is not yet LXC-safe, so we need to use the course grained access control
# strategy of unmounting the filesystem
if (pid == 0):
cap_arg = '--drop='+drop_capabilities
- if (not options.root):
- exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--','--login']+options.command_to_run
+ if (not args.root):
+ exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--user=%s'%slice_name,'--','--login',]+args.command_to_run
else:
- exec_args = [arch,'/usr/sbin/capsh','--','--login']+options.command_to_run
+ exec_args = [arch,'/usr/sbin/capsh','--','--login']+args.command_to_run
- if debug:
- print "exec'ing"
- for arg in exec_args: print ">%s<"%arg
os.environ['SHELL'] = '/bin/sh'
+# Thierry's suggestion:os.environ['HOME'] = '/home/%s'%slice_name
+ if debug: print 'lxcsu-internal:execv:','/usr/bin/setarch',exec_args
os.execv('/usr/bin/setarch',exec_args)
else:
+ setns.proc_umount()
_,status = os.waitpid(pid,0)
exit(os.WEXITSTATUS(status))