From 88ab4535591a1f764b77b469bf5d86683428dc8e Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sun, 23 Jun 2013 08:22:44 +0200 Subject: [PATCH] rename options into ags as we use ArgumentParser and not OtionParser any more --- lxcsu-internal | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lxcsu-internal b/lxcsu-internal index 782ae67..184b68f 100755 --- a/lxcsu-internal +++ b/lxcsu-internal @@ -47,10 +47,10 @@ def main (): parser.add_argument ("slice_name") parser.add_argument ("command_to_run",nargs="*") - options = parser.parse_args() - slice_name=options.slice_name + 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 options.debug: + if args.debug: global debug debug=True @@ -143,13 +143,13 @@ def main (): setns.chcontext('/proc/%s/ns/uts'%pid) setns.chcontext('/proc/%s/ns/ipc'%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): + if (not args.pidns): setns.chcontext('/proc/%s/ns/pid'%pid) if (not os.access('/proc/self',0)): @@ -174,11 +174,11 @@ def main (): 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 -# Thierry's suggestion:exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--user=%s'%slice_name,'--','--login',]+options.command_to_run + if (not args.root): + exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--','--login']+args.command_to_run +# Thierry's suggestion: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 os.environ['SHELL'] = '/bin/sh' # Thierry's suggestion:os.environ['HOME'] = '/home/%s'%slice_name -- 2.43.0