[Libguestfs] [PATCH 4/4] Ignore launch() error in virt-rescue

[Richard W.M. Jones]

On Thu, Aug 26, 2010 at 12:12:01PM +0100, Matthew Booth wrote:
> launch() expects guestfsd to start, which it never does in virt-rescue, so it
> always returns an error about the appliance shutting down unexpectedly.
> ---
>  tools/virt-rescue |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/tools/virt-rescue b/tools/virt-rescue
> index 1f292f6..f466b43 100755
> --- a/tools/virt-rescue
> +++ b/tools/virt-rescue
> @@ -214,7 +214,8 @@ $g->set_append ($str);
>  
>  # Run the appliance.  This won't return until the user quite the
>  # appliance.
> -$g->launch ();
> +# This will definitely return an error because we don't run the daemon
> +eval { $g->launch (); };

It seems a shame to lose the error message here, for example in the
cause where launch really doesn't work, eg. it can't find the
appliance.  How about:

eval { $g->launch (); };
print $@ if $@;

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v