[CRIU] [PATCH 1/4] remove unused --to argument

Tycho Andersen tycho.andersen at canonical.com
Thu Oct 22 12:35:55 PDT 2015


On Thu, Oct 22, 2015 at 10:26:31PM +0400, Nikita Spiridonov wrote:
> On Thu, 2015-10-22 at 11:50 -0600, Tycho Andersen wrote:
> > Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
> > ---
> >  p.haul      | 1 -
> >  p.haul-wrap | 2 +-
> >  2 files changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/p.haul b/p.haul
> > index 5a629bc..9b64864 100755
> > --- a/p.haul
> > +++ b/p.haul
> > @@ -27,7 +27,6 @@ parser = argparse.ArgumentParser("Process HAULer")
> >  parser.add_argument("type", choices=phaul.p_haul_type.get_haul_names(),
> >  	help="Type of hat to haul, e.g. vz or lxc")
> >  parser.add_argument("id", help="ID of what to haul")
> > -parser.add_argument("--to", help="IP where to haul")
> >  parser.add_argument("--fdrpc", help="File descriptor of rpc socket", type=int, required=True)
> >  parser.add_argument("--fdmem", help="File descriptor of memory socket", type=int, required=True)
> >  parser.add_argument("--fdfs", help="File descriptor of fs socket", type=int, required=True)
> > diff --git a/p.haul-wrap b/p.haul-wrap
> > index 1c78c56..c596e09 100755
> > --- a/p.haul-wrap
> > +++ b/p.haul-wrap
> > @@ -63,7 +63,7 @@ def run_phaul_client(args, unknown_args):
> >  	# Organize p.haul args
> >  	target_args = [args.path]
> >  	target_args.extend(unknown_args)
> > -	target_args.extend(["--to", args.to,
> > +	target_args.extend([
> >  		"--fdrpc", str(connection_sks[0].fileno()),
> >  		"--fdmem", str(connection_sks[1].fileno()),
> >  		"--fdfs", str(connection_sks[2].fileno())])
> 
> Not sure about current patch.
> 
> I know that option "--to" inconsistent at the present moment, but there
> is some aspects.
> 
> At first, fs_haul_subtree still use "--to" option (e.g.
> p_haul_fs.set_options) so at least we need to remove it as well. At
> second, upcoming phaul/p_haul_docker.py use that fs_haul_subtree as far
> as I can see.

Oh, whoops. I grepped for \.to and not ["to"] as well; feel free to
drop this one.

Tycho


More information about the CRIU mailing list