From 3d43ec184d64693e57077e2c30d415601dfdf094 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Thu, 5 Aug 2010 16:03:58 +0200
Subject: [PATCH] Print the output of called commands on --verbose (Closes:
 #513126)

---
 bin/xen-create-image | 6 +++++-
 debian/changelog     | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/xen-create-image b/bin/xen-create-image
index 3574d39..117ff8c 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -4205,7 +4205,11 @@ sub runCommand
     }
 
     while (my $line = <CMD>) {
-        logonly $line;
+        if ($CONFIG{ 'verbose' }) {
+            logprint $line;
+        } else {
+            logonly $line;
+        }
     }
 
     my $rcclose = close(CMD);
diff --git a/debian/changelog b/debian/changelog
index a2cbcfb..cad22a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ xen-tools (4.2~rc1-1) UNRELEASED; urgency=low
     - Uses apt-config to parse Dom0's apt.conf. (Closes: #560011)
     - Fixes wrong loop module parameter syntax in warning. Thanks to
       Daniel Baumann for spotting this. (Closes: #516902)
+    - With --verbose, the output of commands called by xen-tools
+      (e.g. debootstrap) is not only logged, but also printed to
+      STDOUT. (Closes: #513126)
   * Bump Standards-Version to 3.9.1 (no changes)
 
  -- Axel Beckert <abe@debian.org>  Wed, 02 Jun 2010 18:10:34 +0200