[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v2 06/11] Cope with Jessie's d-i vg name
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 v2: 1. Make Jessie case default. --- ts-host-install | 7 +++++-- ts-xen-build-prep | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ts-host-install b/ts-host-install index 242bfb0..50b39a0 100755 --- a/ts-host-install +++ b/ts-host-install @@ -87,10 +87,13 @@ END await_tcp(get_timeout($ho,'reboot',$timeout{Sshd}), 14,$ho); - our $vgname= $ho->{Name}; + our $vgname= $ho->{Suite} =~ m/wheezy|squeeze/ + ? $ho->{Name} + : $ho->{Suite} =~ m/lenny/ + ? "$ho->{Name}.$c{TestHostDomain}" + : "$ho->{Name}-vg"; 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..befb7d4 100755 --- a/ts-xen-build-prep +++ b/ts-xen-build-prep @@ -53,9 +53,11 @@ sub overall_limit_pe ($) { sub determine_vg_lv () { $vg= - $ho->{Suite} =~ m/lenny/ - ? "$ho->{Name}.$c{TestHostDomain}" - : $ho->{Name}; + $ho->{Suite} =~ m/wheezy|squeeze/ + ? $ho->{Name} + : $ho->{Suite} =~ m/lenny/ + ? "$ho->{Name}.$c{TestHostDomain}" + : "$ho->{Name}-vg"; $lv = "/dev/$vg/$lvleaf"; } -- 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |