From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH OSSTEST v3 06/11] Cope with Jessie's d-i vg
	name
Date: Wed, 17 Jun 2015 15:22:09 +0100
Message-ID: <1434550929.13744.398.camel@citrix.com>
References: <1434546404-2036-1-git-send-email-wei.liu2@citrix.com>
	<1434546404-2036-7-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>
Received: from mail6.bemta3.messagelabs.com ([195.245.230.39])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=6035412ff=Ian.Campbell@citrix.com>)
	id 1Z5EET-0003sa-Bj
	for xen-devel@lists.xenproject.org; Wed, 17 Jun 2015 14:22:25 +0000
In-Reply-To: <1434546404-2036-7-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: Wei Liu <wei.liu2@citrix.com>
Cc: Xen-devel <xen-devel@lists.xenproject.org>, ian.jackson@eu.citrix.com
List-Id: xen-devel@lists.xenproject.org

On Wed, 2015-06-17 at 14:06 +0100, Wei Liu wrote:
> In Jessie the default vg name is changed to "$hostname-vg". Make that
> default case and check for wheezy, squeeze and lenny for backward
> compatibility.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> Changes in v3:
> 1. Introduce a function to return vg name and use it.

Testing on ARM64 I get:
Undefined subroutine &main::di_vg_name called at ./ts-xen-build-prep line 55.

I'm pretty certain this isn't to do with my arm4 patches.

I suspect adding "use Debian" to ts-xen-build-prep will fix it, I'm not
sure if there is a reason it doesn't do so already. Given that it has a
bunch of Debian-ish stuff in it I see no reason to avoid it...


> 
> Changes in v2:
> 1. Make Jessie case default.
> ---
>  Osstest/Debian.pm | 13 +++++++++++++
>  ts-host-install   |  3 +--
>  ts-xen-build-prep |  5 +----
>  3 files changed, 15 insertions(+), 6 deletions(-)
> 
> diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> index 8ad673e..b1a5396 100644
> --- a/Osstest/Debian.pm
> +++ b/Osstest/Debian.pm
> @@ -43,6 +43,7 @@ BEGIN {
>                        preseed_hook_overlay
>                        preseed_hook_cmds
>                        di_installcmdline_core
> +                      di_vg_name
>                        );
>      %EXPORT_TAGS = ( );
>  
> @@ -566,6 +567,18 @@ sub di_installcmdline_core ($$;@) {
>      return @cl;
>  }
>  
> +sub di_vg_name($) {
> +    my ($ho) = @_;
> +
> +    if ($ho->{Suite} =~ m/wheezy|squeeze/) {
> +	return $ho->{Name};
> +    }
> +    if ($ho->{Suite} =~ m/lenny/){
> +	return "$ho->{Name}.$c{TestHostDomain}";
> +    }
> +    return "$ho->{Name}-vg";
> +}
> +
>  sub preseed_ssh ($$) {
>      my ($ho,$sfx) = @_;
>  
> diff --git a/ts-host-install b/ts-host-install
> index 242bfb0..04d5487 100755
> --- a/ts-host-install
> +++ b/ts-host-install
> @@ -87,10 +87,9 @@ END
>  
>      await_tcp(get_timeout($ho,'reboot',$timeout{Sshd}), 14,$ho);
>  
> -    our $vgname= $ho->{Name};
> +    our $vgname = di_vg_name($ho);
>  
>      if ($ho->{Suite} =~ m/lenny/) {
> -        $vgname .= ".$c{TestHostDomain}";
>          target_editfile_root($ho, '/boot/grub/menu.lst', sub {
>              while (<EI>) {
>                  s/^terminal.*/terminal --timeout=10 serial console/;
> diff --git a/ts-xen-build-prep b/ts-xen-build-prep
> index 4dece65..deee24c 100755
> --- a/ts-xen-build-prep
> +++ b/ts-xen-build-prep
> @@ -52,10 +52,7 @@ sub overall_limit_pe ($) {
>  }
>  
>  sub determine_vg_lv () {
> -    $vg=
> -        $ho->{Suite} =~ m/lenny/
> -        ? "$ho->{Name}.$c{TestHostDomain}"
> -        : $ho->{Name};
> +    $vg = di_vg_name($ho);
>      $lv = "/dev/$vg/$lvleaf";
>  }
>