From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 22 Sep 2015 09:33:00 +0000 (+0100)
Subject: Debian: uboot: Use di_vg_name() and lv_dev_mapper() for root=
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=06dd6350b0382ef9ee2ebd67e24b7ed15555f8e7;p=people%2Fliuw%2Fosstest.git

Debian: uboot: Use di_vg_name() and lv_dev_mapper() for root=

root is not a "guest lv", so using target_guest_lv_name is misleading.

target_guest_lv_name also fails to properly handle the d-i vg name
correctly, which di_vg_name does. Specifically under Jessie an extra
"-vg" is appended to the hostname compared with Wheezy and Squeeze.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 153b375..9347c49 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -131,7 +131,7 @@ sub uboot_common_kernel_bootargs ($)
 {
     my ($ho) = @_;
 
-    my $root= target_guest_lv_name($ho,"root");
+    my $root= lv_dev_mapper(di_vg_name($ho),"root");
     my $rootdelay= get_host_property($ho, "rootdelay");
 
     my @bootargs;