From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 14 Dec 2017 12:23:12 +0000 (+0000)
Subject: di_special_kernel: Pass $kp to $fn
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6b503965a0ab4d91be888c39dc028cad2895b774;p=people%2Fliuw%2Fosstest.git

di_special_kernel: Pass $kp to $fn

Adjust the one current caller.  No functional change

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

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index ba39ad2..6a1babf 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1046,7 +1046,7 @@ END
 
 sub di_special_kernel ($$$) {
     my ($ho, $d_i, $fn) = @_;
-    # calls $fn->($kernel, $cpio) # either or both may be undef
+    # calls $fn->($kp, $kernel, $cpio) # $kernel and/or $cpio may be undef
     foreach my $kp (keys %{ $ho->{Flags} }) {
         my $kernel;
         # Backwards compatibility
@@ -1070,7 +1070,7 @@ sub di_special_kernel ($$$) {
         } else {
             die "$kp $cpio $!";
         }
-        $fn->($kernel, $cpio);
+        $fn->($kp, $kernel, $cpio);
     }
 }
 
diff --git a/ts-host-install b/ts-host-install
index 2165436..01d04d4 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -182,7 +182,7 @@ sub setup_netboot_firstboot($) {
     }
 
     di_special_kernel($ho, $d_i, sub {
-        my ($k, $cpio) = @_;
+        my ($kp, $k, $cpio) = @_;
         $kernel = $k if defined $k;
         push @initrds, $cpio if defined $cpio;
     });