di_special_kernel: Use in preseed_create

This abolishes yet another open-coding of need-kernel-deb-* handling.

Again, there is little functional change.  A significant change is
that now if the special kernel deb does not exist, we do not fail.

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

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index baaab907f8c935b38f551e6f22e3dad55f6b1ec9..b46d22260320084aa2ef07066afbc828a58068ff 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1195,10 +1195,8 @@ END
 
     my $backports_kernel;
 
-    foreach my $kp (keys %{ $ho->{Flags} }) {
-       # Backwards compatibility
-       $kp = "need-kernel-deb-wheezy-backports" if $kp eq "need-kernel-deb-armmp";
-       $kp =~ s/need-kernel-deb-$ho->{Suite}-// or next;
+    di_special_kernel($ho, sub {
+        my ($kp, $tp, $kernel, $cpio_ignored) = @_;
 
        if ($kp eq 'backports') {
             $backports_kernel = 1;
@@ -1231,7 +1229,7 @@ END
         };
 
         my $kern = "$d_i/$kp.deb";
-        $kdeb->("kernel", $kern);
+        $kdeb->("kernel", $kern) if defined $kernel;
 
         my $ird = "$d_i/initramfs-tools.deb";
         if (stat $ird) {
@@ -1249,7 +1247,7 @@ in-target apt-get install -f -y
 END
 
        preseed_hook_command($ho, 'late_command', $sfx, $cmds);
-    }
+    });
 
     if ( $ho->{Flags}{'need-uboot-bootscr'} ) {
        my @bootargs = uboot_common_kernel_bootargs($ho);