[Libguestfs] [PATCH 4/4] p2v: add -x option to nm-online

[Richard W.M. Jones]

On Wed, Jun 22, 2016 at 11:45:35AM +0200, Cédric Bosdonnat wrote:
> On distros not running NetworkManager, use the nm-online -x parameter
> to exit quickly. The network connection will be checked just after
> anyway when attempting to connect to the conversion server using ssh.
> ---
>  p2v/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/p2v/utils.c b/p2v/utils.c
> index c4f82cd..746093b 100644
> --- a/p2v/utils.c
> +++ b/p2v/utils.c
> @@ -139,7 +139,7 @@ get_if_vendor (const char *if_name, int truncate)
>  }
>  
>  /* XXX We could make this configurable. */
> -#define NETWORK_ONLINE_COMMAND "nm-online -t 30"
> +#define NETWORK_ONLINE_COMMAND "nm-online -t 30 -x"
>  
>  /**
>   * Wait for the network to come online, but don't error out if that

I had to revert this as it breaks p2v/test-virt-p2v-pxe.sh (only
run when you use "make check-slow" or
"make -C p2v run-virt-p2v-non-gui-conversion").

I'm not actually sure why it breaks it, since the VM in that test is
running NetworkManager.  It could be some kind of boot ordering issue.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html