[Xen-devel] [OSSTEST PATCH 33/35] d-i: When using backports kernel, suppress kernel modules warning

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Osstest/Debian.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 0137fc4..06918ef 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -1124,12 +1124,15 @@ in-target tar -C /boot -xaf /tmp/dtbs.tar.gz
 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;
 
        if ($kp eq 'backports') {
+            $backports_kernel = 1;
            preseed_backports_packages($ho, $sfx, \%xopts, $suite,
                                       qw(linux-base));
        }
@@ -1322,7 +1325,7 @@ END
 
     $preseed_file .= preseed_hook_cmds();
 
-    if ($ho->{Flags}{'no-di-kernel'}) {
+    if ($backports_kernel || $ho->{Flags}{'no-di-kernel'}) {
        $preseed_file .= <<END;
 d-i anna/no_kernel_modules boolean true
 d-i base-installer/kernel/skip-install boolean true
-- 
2.1.4


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