From 48097cd07b4d8ae0d073b37d2f40dff64bca119f Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Thu, 25 Sep 2014 23:18:48 +0200
Subject: [PATCH] Fix initial configuration summary in cases where pygrub is
 used

---
 bin/xen-create-image | 27 ++++++++++++++++-----------
 debian/changelog     |  1 +
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bin/xen-create-image b/bin/xen-create-image
index 320b7c1..6a480bc 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -2563,19 +2563,24 @@ sub showSummary
         logprint("Max mem size   : $CONFIG{'maxmem'}\n");
     }
 
-    if ( defined( $CONFIG{ 'kernel' } ) && length( $CONFIG{ 'kernel' } ) )
-    {
-        logprint("Kernel path    :  $CONFIG{'kernel'}\n");
-    }
+    if ( exists(  $CONFIG{ 'pygrub' } ) &&
+         $CONFIG{ 'pygrub' } ) {
+        logprint("Bootloader     :  pygrub\n");
+    } else {
+        if ( defined( $CONFIG{ 'kernel' } ) && length( $CONFIG{ 'kernel' } ) )
+        {
+            logprint("Kernel path    :  $CONFIG{'kernel'}\n");
+        }
 
-    if ( defined( $CONFIG{ 'modules' } ) && length( $CONFIG{ 'modules' } ) )
-    {
-        logprint("Module path    :  $CONFIG{'modules'}\n");
-    }
+        if ( defined( $CONFIG{ 'modules' } ) && length( $CONFIG{ 'modules' } ) )
+        {
+            logprint("Module path    :  $CONFIG{'modules'}\n");
+        }
 
-    if ( defined( $CONFIG{ 'initrd' } ) && length( $CONFIG{ 'initrd' } ) )
-    {
-        logprint("Initrd path    :  $CONFIG{'initrd'}\n");
+        if ( defined( $CONFIG{ 'initrd' } ) && length( $CONFIG{ 'initrd' } ) )
+        {
+            logprint("Initrd path    :  $CONFIG{'initrd'}\n");
+        }
     }
 
     logprint("\nNetworking Information\n");
diff --git a/debian/changelog b/debian/changelog
index 3bf2738..49b4b5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ xen-tools (4.4+dev-1) UNRELEASED; urgency=low
     + Fix lvcreate awaiting user input when creating swap lv (Closes: #754517)
       Thanks Eric Engstrom!
     + Fix missing quoting in shell function "assert" in hooks/common.sh.
+    + Fix initial configuration summary in cases where pygrub is used.
   * Bump Standards-Version to 3.9.6 (no changes needed)
   * Fix lintian warning depends-on-perl-modules.