Merge branch '4.2'

Conflicts:
	debian/changelog

bin/xen-create-nfs

@@ -380,6 +380,30 @@ sub testArguments
     die "Missing NFS root."   unless ( $CONFIG{ 'nfs_root' } );
 
 
+    # Shorthack to fix http://bugs.debian.org/648814 -- xen-create-nfs
+    # should better use xt-create-xen-config instead. Guess from where
+    # this code is borrowed for now...
+
+    if ( exists($CONFIG{ 'memory' }) and
+	 defined($CONFIG{ 'memory' }) ) {
+
+	#
+	#  The memory size:  Convert Gb -> Mb.
+	#
+	if ( $CONFIG{ 'memory' } =~ /^(\d+)Gb.*$/i )
+	{
+	    $CONFIG{ 'memory' } = $1 * 1024;
+	}
+
+	#
+	#  Remove any trailing Mb.
+	#
+	if ( $CONFIG{ 'memory' } =~ /^(\d+)Mb.*$/i )
+	{
+	    $CONFIG{ 'memory' } = $1;
+	}
+
+    }
     # All OK.
 }
 

bin/xt-create-xen-config

@@ -375,7 +375,7 @@ sub createXenConfig
     #
     #  The memory size:  Convert Gb -> Mb.
     #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Gb*$/i )
+    if ( $ENV{ 'memory' } =~ /^(\d+)Gb.*$/i )
     {
         $ENV{ 'memory' } = $1 * 1024;
     }
@@ -383,7 +383,7 @@ sub createXenConfig
     #
     #  Remove any trailing Mb.
     #
-    if ( $ENV{ 'memory' } =~ /^(\d+)Mb*$/i )
+    if ( $ENV{ 'memory' } =~ /^(\d+)Mb.*$/i )
     {
         $ENV{ 'memory' } = $1;
     }

debian/changelog

@@ -6,9 +6,12 @@ xen-tools (4.2.1+dev-1) UNRELEASED; urgency=low
   * Support creating Ubuntu 11.10 Oneiric DomUs (LP: #848654)
   * No more suggest evms-cli -- it's no more available on any supported
     Dom0 distribution. Thanks to Markus Waldeck for the hint.
+  * Workaround for missing unit parsing in xen-create-nfs (Closes:
+    #648814)
+  * Fix wildcard vs regexp in memory configuration parsing.
   * Fix Lintian warning copyright-refers-to-symlink-license.
 
- -- Axel Beckert <abe@debian.org>  Tue, 13 Sep 2011 15:50:59 +0200
+ -- Axel Beckert <abe@debian.org>  Tue, 15 Nov 2011 22:32:56 +0100
 
 xen-tools (4.2.1-1) unstable; urgency=low