Save exit code $? at the beginning of the END block

Otherwise cleaning up by doing some system() calls garbles $? with
unwanted values.

diff --git a/KNOWN_BUGS.markdown b/KNOWN_BUGS.markdown
index cacbff5cd23bdfcd6c5e8460146cf6987b67dbfb..f3c027870f3e525a7e0cc732289fc05613aca952 100644 (file)
--- a/KNOWN_BUGS.markdown
+++ b/KNOWN_BUGS.markdown
@@ -4,8 +4,7 @@ KNOWN BUGS in xen-tools
 Bugs to fix before next release
 -------------------------------
 
-* Exit code of a failed xen-create-image run seems still to be 0, at
-  least in some cases.
+[None so far]
 
 Bugs to fix rather soon
 -----------------------

diff --git a/bin/xen-create-image b/bin/xen-create-image
index 4f1bc44e1de225eb4ffb1efb720068eb9dcf494f..f3e40cd2f66bae45eac3bbf4de34f8164ddb6386 100755 (executable)
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -4094,7 +4094,10 @@ sub clean_up () {
 
 END
 {
-    exit 0 if $VERSION || $HELP || $MANUAL || $DUMPCONFIG;
+    # Capture exit code
+    my $exitcode = $?;
+
+    exit $exitcode if $VERSION || $HELP || $MANUAL || $DUMPCONFIG;
 
     my $host_rsa_key = '';
     #
@@ -4234,4 +4237,6 @@ END
         }
         logprint("\n");
     }
+
+    exit $exitcode;
 }