X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=31e7dd635def17e2b802c88ddcc1989858430f39;hb=4a32f868cd9121e50d2e608ddbd31a42249e6e2e;hp=5756162e7bbf50a393913544679e0acd025ad9c9;hpb=e0abda420d460dc1a717193b2eabc564bd81feb1;p=lxc-userspace.git diff --git a/lxcsu b/lxcsu index 5756162..31e7dd6 100755 --- a/lxcsu +++ b/lxcsu @@ -215,7 +215,7 @@ def main (): if (not args.root): uid = getuid (slice_name) if not uid: - print "lxcsu-internal could not spot %s in /etc/passwd - exiting"%slice_name + print "lxcsu could not spot %s in /etc/passwd - exiting"%slice_name exit(1) exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--uid=%s'%uid,'--','--login',]+args.command_to_run # once we can drop f12, it would be nicer to instead go for @@ -227,7 +227,7 @@ def main (): os.environ['HOME'] = '/home/%s'%slice_name os.environ['LD_PRELOAD'] = '/etc/planetlab/lib/bind_public.so' os.chdir("/home/%s"%(slice_name)) - print 'lxcsu-internal:execv:','/usr/bin/setarch',exec_args + if debug: print 'lxcsu:execv:','/usr/bin/setarch',exec_args os.execv('/usr/bin/setarch',exec_args) else: setns.proc_umount()