From: Matthew Booth <mbooth@redhat.com>
Date: Thu, 26 Aug 2010 14:08:20 +0000 (+0100)
Subject: Ignore launch() error in virt-rescue. (RHBZ#618556)
X-Git-Tag: 1.5.5~6
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=c3194e4d370d917db9900a31ea18f10492554da4

Ignore launch() error in virt-rescue. (RHBZ#618556)

launch() expects guestfsd to start, which it never does in virt-rescue, so it
always returns an error about the appliance shutting down unexpectedly.
---

diff --git a/tools/virt-rescue b/tools/virt-rescue
index 1f292f6..51ac760 100755
--- a/tools/virt-rescue
+++ b/tools/virt-rescue
@@ -19,6 +19,7 @@
 use warnings;
 use strict;
 
+use Errno;
 use Sys::Guestfs;
 use Sys::Guestfs::Lib qw(open_guest);
 use Pod::Usage;
@@ -214,7 +215,11 @@ $g->set_append ($str);
 
 # Run the appliance.  This won't return until the user quite the
 # appliance.
-$g->launch ();
+eval { $g->launch (); };
+
+# launch() expects guestfsd to start. However, virt-rescue doesn't run guestfsd,
+# so this will always fail with ECHILD when the appliance exits unexpectedly.
+die $@ unless $!{ECHILD};
 
 exit 0;