diff mbox

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

Message ID 1484914764-20861-34-git-send-email-ian.jackson@eu.citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Jackson Jan. 20, 2017, 12:19 p.m. UTC 
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/Debian.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff mbox

Patch

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