From 7188b82eb9424b6eb97c6dba1bae68b4774f7bc8 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Thu, 23 May 2013 18:02:56 -0400 Subject: [PATCH] Detect architecture of lxc container and make sure the spawned environment has the same architecture. --- lxcsu | 67 ++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/lxcsu b/lxcsu index d805e7b..9282a9a 100644 --- a/lxcsu +++ b/lxcsu @@ -9,6 +9,18 @@ from optparse import OptionParser drop_capabilities='cap_sys_admin,cap_sys_boot,cap_sys_module' +def getarch(f): + output = os.popen('readelf -h %s 2>&1'%f).readlines() + classlines = [x for x in output if ('Class' in x.split(':')[0])] + line = classlines[0] + c = line.split(':')[1] + if ('ELF64' in c): + return 'x86_64' + elif ('ELF32' in c): + return 'i686' + else: + raise Exception('Could not determine architecture') + def umount(fs_dir): output = os.popen('/bin/umount %s 2>&1'%fs_dir).read() return ('device is busy' not in fs_dir) @@ -30,35 +42,37 @@ parser.add_option("-r", "--root", (options, args) = parser.parse_args() try: - slice_name = args[0] + slice_name = args[0] except IndexError: - print "You must specify a vm name" - exit(1) + print "You must specify a vm name" + exit(1) try: - cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name - output = os.popen(cmd).readlines() + cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name + output = os.popen(cmd).readlines() except: - print "Error finding slice %s"%slice_name - exit(1) + print "Error finding slice %s"%slice_name + exit(1) slice_spec = None + for e in output: - try: - l = e.rstrip() - path = l.split(':')[0] - comp = l.rsplit(':')[-1] - slice_name_check = comp.rsplit('/')[-1] - - if (slice_name_check == slice_name): - slice_path = path - pid = slice_path.split('/')[2] - cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00') - if (cmdline == '/sbin/init'): - slice_spec = slice_path - break - except: - break + try: + l = e.rstrip() + path = l.split(':')[0] + comp = l.rsplit(':')[-1] + slice_name_check = comp.rsplit('/')[-1] + + if (slice_name_check == slice_name): + slice_path = path + pid = slice_path.split('/')[2] + cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00') + if (cmdline == '/sbin/init'): + slice_spec = slice_path + arch = getarch('/proc/%s/exe'%pid) + break + except: + break if (not slice_spec or not pid): print "Not started: %s"%slice_name @@ -121,16 +135,17 @@ if (not umount('/sys/fs/cgroup')): pid = os.fork() +#arch = 'x86_64' if (pid == 0): cap_arg = '--drop='+drop_capabilities + if (not options.root): - exec_args = ['/usr/sbin/capsh',cap_arg,'--','--login']+args[1:] + exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--','--login']+args[1:] else: - exec_args = ['/usr/sbin/capsh','--','--login']+args[1:] - + exec_args = [arch,'/usr/sbin/capsh','--','--login']+args[1:] os.environ['SHELL'] = '/bin/sh' - os.execv('/usr/sbin/capsh',exec_args) + os.execv('/usr/bin/setarch',exec_args) else: _,status = os.waitpid(pid,0) exit(os.WEXITSTATUS(status)) -- 2.43.0