[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH OSSTEST v3 06/11] Cope with Jessie's d-i vg name
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@xxxxxxxxxx> > --- > 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"; > } > _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |