From 222b7d35d70c16a970bb5e3e4b75950de9c929e8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 23 Aug 2011 16:41:07 +0100 Subject: [PATCH] rescue: Ignore errno after guestfs_launch. errno is pretty much random on the error path back from guestfs_launch so there is nothing useful to be gained by checking it. We could do with a better way to detect if appliance launch failed. (cherry picked from commit 00fef9eed6a53e10a975814beef775483ff0b3dd) --- rescue/virt-rescue.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/rescue/virt-rescue.c b/rescue/virt-rescue.c index dd033aa..7c8a57b 100644 --- a/rescue/virt-rescue.c +++ b/rescue/virt-rescue.c @@ -294,16 +294,6 @@ main (int argc, char *argv[]) /* We expect launch to fail, so ignore the return value. */ ignore_value (guestfs_launch (g)); - /* launch() expects guestfsd to start. However, virt-rescue doesn't - * run guestfsd, so this will always fail with ECHILD when the - * appliance exits unexpectedly. - */ - if (errno != ECHILD) { - fprintf (stderr, "%s: %s\n", program_name, guestfs_last_error (g)); - guestfs_close (g); - exit (EXIT_FAILURE); - } - guestfs_close (g); exit (EXIT_SUCCESS); -- 1.8.3.1