summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-24 16:11:12 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-24 16:11:12 +0000
commit11897b084741b02eb6ab0b31a3b43cc7e845760d (patch)
tree7354c6b014d77359411cb4a97a0a067722d03c40
parent59255c556db6a1fbb94458d87f798a58d39a056f (diff)
downloaddrakx-backup-do-not-use-11897b084741b02eb6ab0b31a3b43cc7e845760d.tar
drakx-backup-do-not-use-11897b084741b02eb6ab0b31a3b43cc7e845760d.tar.gz
drakx-backup-do-not-use-11897b084741b02eb6ab0b31a3b43cc7e845760d.tar.bz2
drakx-backup-do-not-use-11897b084741b02eb6ab0b31a3b43cc7e845760d.tar.xz
drakx-backup-do-not-use-11897b084741b02eb6ab0b31a3b43cc7e845760d.zip
don't account scanners as unknown devices
-rw-r--r--perl-install/harddrake/data.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index fae9eb56c..970299d76 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -10,7 +10,7 @@ our ($version, $sbindir, $bindir) = ("1.1.6", "/usr/sbin", "/usr/bin");
# Update me each time you handle one more devices class (aka configurator)
sub unknown {
- grep { $_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_IDE|BRIDGE|NETWORK/ } detect_devices::probeall(1);
+ grep { ($_->{media_type} !~ /tape|SERIAL_(USB|SMBUS)|Printer|DISPLAY|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|STORAGE_IDE|BRIDGE|NETWORK/) && ($_->{driver} ne 'scanner') } detect_devices::probeall(1);
}