Re: [Xen-devel] [PATCH OSSTEST 6/6] ts-debian-install: pass 'Mb' as memory size

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Mon, Sep 23, 2013 at 12:09:32PM +0100, Ian Campbell wrote:
> On Fri, 2013-09-20 at 10:15 +0100, Wei Liu wrote:
> > 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@xxxxxxxxxx>
> > ---
> >  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 \\
> 
> The docs use Mb etc for --swap too. I think we should be consistent...
> 

Sure, updated patch.

----8<---
From 3e19bdbd0a60ddb55f9f5427df5c9d32281e361f Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@xxxxxxxxxx>
Date: Fri, 20 Sep 2013 09:49:50 +0100
Subject: [PATCH] ts-debian-install: pass 'Mb' as memory / swap size

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

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

Also pass 'Mb' to swap size for consistency.

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

diff --git a/ts-debian-install b/ts-debian-install
index 28f95cc..519edc9 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}Mb \\
             --dist $gsuite \\
             --mirror http://$c{DebianMirrorHost}/$c{DebianMirrorSubpath} \\
             --hostname $gho->{Name} \\
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel