[Libguestfs] [PATCH] btrfs_replace: fix position of subcommand options

[Richard W.M. Jones]

On Tue, May 30, 2017 at 12:52:22PM +0200, Pino Toscano wrote:
> btrfs-progs 4.11 is more strict with option parsing, so subcommand
> options must appear now before the subcommand arguments.

Hmm, sounds like a bug in btrfs, but ACK anyway.

Rich.

>  daemon/btrfs.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/daemon/btrfs.c b/daemon/btrfs.c
> index 23513a9..ae2310b 100644
> --- a/daemon/btrfs.c
> +++ b/daemon/btrfs.c
> @@ -2185,11 +2185,11 @@ do_btrfs_replace (const char *srcdev, const char *targetdev,
>    ADD_ARG (argv, i, str_btrfs);
>    ADD_ARG (argv, i, "replace");
>    ADD_ARG (argv, i, "start");
> -  ADD_ARG (argv, i, srcdev);
> -  ADD_ARG (argv, i, targetdev);
> -  ADD_ARG (argv, i, path_buf);
>    ADD_ARG (argv, i, "-B");
>    ADD_ARG (argv, i, "-f");
> +  ADD_ARG (argv, i, srcdev);
> +  ADD_ARG (argv, i, targetdev);
> +  ADD_ARG (argv, i, path_buf);
>    ADD_ARG (argv, i, NULL);
>  
>    r = commandv (NULL, &err, argv);
> -- 
> 2.9.4
> 
> _______________________________________________
> Libguestfs mailing list
> Libguestfs at redhat.com
> https://www.redhat.com/mailman/listinfo/libguestfs

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW