[Xen-devel] [PATCH OSSTEST 3/5] Cope with Jessie's d-i vg name

[Wei Liu <wei.liu2@xxxxxxxxxx>]

In ts-xen-build-prep, replace matching lenny with jessie since lenny is
not used in production anymore.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 ts-host-install   | 4 +++-
 ts-xen-build-prep | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ts-host-install b/ts-host-install
index b73c7ff..6e2106e 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -87,7 +87,9 @@ END
 
     await_tcp(get_timeout($ho,'reboot',$timeout{Sshd}), 14,$ho);
 
-    our $vgname= $ho->{Name};
+    our $vgname= $ho->{Suite} =~ m/jessie/
+                 ? "$ho->{Name}-vg"
+                 : $ho->{Name};
 
     if ($ho->{Suite} =~ m/lenny/) {
         $vgname .= ".$c{TestHostDomain}";
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 4dece65..25ba3d4 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -53,8 +53,8 @@ sub overall_limit_pe ($) {
 
 sub determine_vg_lv () {
     $vg=
-        $ho->{Suite} =~ m/lenny/
-        ? "$ho->{Name}.$c{TestHostDomain}"
+        $ho->{Suite} =~ m/jessie/
+        ? "$ho->{Name}-vg"
         : $ho->{Name};
     $lv = "/dev/$vg/$lvleaf";
 }
-- 
1.9.1


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