From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH OSSTEST 6/6] ts-debian-install: pass 'Mb' as
	memory size
Date: Fri, 20 Sep 2013 10:15:46 +0100
Message-ID: <1379668546-5267-7-git-send-email-wei.liu2@citrix.com>
References: <1379668546-5267-1-git-send-email-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1379668546-5267-1-git-send-email-wei.liu2@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>, ian.jackson@eu.citrix.com, ian.campbell@citrix.com
List-Id: xen-devel@lists.xenproject.org

The original code passed 'M' which triggers Debian bug #691320 in
Wheezy.

Passing 'Mb' should work both for Squeeze and Wheezy.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 ts-debian-install |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ts-debian-install b/ts-debian-install
index 28f95cc..fad2d0c 100755
--- a/ts-debian-install
+++ b/ts-debian-install
@@ -66,7 +66,7 @@ sub ginstall () {
     target_cmd_root($ho, <<END, 2000);
         xen-create-image \\
             --dhcp --mac $gho->{Ether} \\
-	    --memory ${ram_mb}M --swap ${swap_mb}M \\
+            --memory ${ram_mb}Mb --swap ${swap_mb}M \\
             --dist $gsuite \\
             --mirror http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} \\
             --hostname $gho->{Name} \\
-- 
1.7.10.4