diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-04-16 15:30:59 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-04-16 15:30:59 +0000 |
| commit | 2e48cb2858ce05709d3392a8e3b1d2a40a15d973 (patch) | |
| tree | ce3dc6e73f82998f22c5cce7d2e862bf8f9e905c | |
| parent | 4e6e854f88ed6e450ec4a09d9985434b7198e58f (diff) | |
| download | drakx-2e48cb2858ce05709d3392a8e3b1d2a40a15d973.tar drakx-2e48cb2858ce05709d3392a8e3b1d2a40a15d973.tar.gz drakx-2e48cb2858ce05709d3392a8e3b1d2a40a15d973.tar.bz2 drakx-2e48cb2858ce05709d3392a8e3b1d2a40a15d973.tar.xz drakx-2e48cb2858ce05709d3392a8e3b1d2a40a15d973.zip | |
always detect PCI modems (even when (slow) detecting serial modems is disabled)
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/harddrake2 | 2 |
2 files changed, 5 insertions, 1 deletions
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) |