From 2e48cb2858ce05709d3392a8e3b1d2a40a15d973 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 16 Apr 2009 15:30:59 +0000 Subject: always detect PCI modems (even when (slow) detecting serial modems is disabled) --- perl-install/NEWS | 4 ++++ perl-install/standalone/harddrake2 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'perl-install') diff --git a/perl-install/NEWS b/perl-install/NEWS index 77eb21266..ab34171a6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- harddrake: + o always detect PCI modems (even when (slow) detecting serial modems + is disabled) + Version 12.28.1 - 16 April 2009 - diskdrake: diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 409b7a9b2..7a04c6231 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -392,8 +392,8 @@ foreach my $hw_class (@harddrake::data::tree) { next if ref($detector) ne "CODE"; #skip class witouth detector next if $Ident =~ /(MODEM|PRINTER)/ && $::testing; next if $Ident =~ /JAZZ/ && !$options{JAZZ_DETECTION}; - next if $Ident =~ /MODEM/ && !$options{MODEMS_DETECTION}; next if $Ident =~ /PRINTER/ && !$options{PRINTERS_DETECTION}; + $detect_devices::detect_serial_modem = 0 if $harddrake::data =~ /MODEM/ && !$options{MODEMS_DETECTION}; my @devices = $detector->(\%options); next unless @devices; # Skip empty class (no devices) -- cgit v1.2.1