[Xen-devel] [OSSTEST PATCH 06/11] di_special_kernel: Use di_installer_path

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

This avoids the caller having to supply $d_i.  This is good because
there is a site we want to call this from which uses that name for a
different value!

No functional change.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Osstest/Debian.pm | 5 +++--
 ts-host-install   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 7664194..889cb0e 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1054,9 +1054,10 @@ sub di_installer_path ($) {
        .'-'.$ho->{Suite};
 }
 
-sub di_special_kernel ($$$) {
-    my ($ho, $d_i, $fn) = @_;
+sub di_special_kernel ($$) {
+    my ($ho, $fn) = @_;
     # calls $fn->($kp, $kernel, $cpio) # $kernel and/or $cpio may be undef
+    my $d_i = di_installer_path($ho);
     foreach my $kp (keys %{ $ho->{Flags} }) {
         my $kernel;
         # Backwards compatibility
diff --git a/ts-host-install b/ts-host-install
index a5cf93b..d83d81b 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -181,7 +181,7 @@ sub setup_netboot_firstboot($) {
         }
     }
 
-    di_special_kernel($ho, $d_i, sub {
+    di_special_kernel($ho, sub {
         my ($kp, $k, $cpio) = @_;
         $kernel = $k if defined $k;
         push @initrds, $cpio if defined $cpio;
@@ -214,7 +214,7 @@ END
 
     my %xopts;
 
-    di_special_kernel($ho, $d_i, sub {
+    di_special_kernel($ho, sub {
         my ($kp,$k,$c) = @_;
        $xopts{dtbs} = "/$d_i/$kp-dtbs"
            if -e "$ho->{Tftp}{Path}/$d_i/$kp-dtbs";
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel