From: Wei Liu Subject: Re: [PATCH OSSTEST 6/6] ts-debian-install: pass 'Mb' as memory size Date: Mon, 23 Sep 2013 12:14:35 +0100 Message-ID: <20130923111435.GC9078@zion.uk.xensource.com> References: <1379668546-5267-1-git-send-email-wei.liu2@citrix.com> <1379668546-5267-7-git-send-email-wei.liu2@citrix.com> <1379934572.19256.125.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1379934572.19256.125.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: ian.jackson@eu.citrix.com, Wei Liu , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org 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 > > --- > > 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, < > 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 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 --- 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, <{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