diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2006-01-20 16:47:31 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2006-01-20 16:47:31 +0000 |
| commit | 87b9292ac3034a8d1c0142da390857d179830f0f (patch) | |
| tree | e750dd3a54374157bf43fc733ae903770d4eaf1c /perl-install/scanner.pm | |
| parent | ca81a8740f059ac75fae08a8ac185db19270dffe (diff) | |
| download | drakx-87b9292ac3034a8d1c0142da390857d179830f0f.tar drakx-87b9292ac3034a8d1c0142da390857d179830f0f.tar.gz drakx-87b9292ac3034a8d1c0142da390857d179830f0f.tar.bz2 drakx-87b9292ac3034a8d1c0142da390857d179830f0f.tar.xz drakx-87b9292ac3034a8d1c0142da390857d179830f0f.zip | |
- Moved loading of kernel modules before the port checking step, the
device file is usually generated when the module is loaded
- Support for loading kernel modules only in case of a certain
connection type (SCSI, USB, Parport).
- Let kernel module only be added to /etc/modules and
/etc/modprobe.preload if loading of the module with "modprobe"
succeeded.
- Do not die when loading of a kernel module does not succeed.
- s/Hewlett Packard/Hewlett-Packard/ when generating ScannerDB.
Diffstat (limited to 'perl-install/scanner.pm')
| -rwxr-xr-x | perl-install/scanner.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm index 8660aefd3..bdbcd2193 100755 --- a/perl-install/scanner.pm +++ b/perl-install/scanner.pm @@ -489,6 +489,9 @@ sub readScannerDB { SERVER => sub { $card->{server} = $val }, DRIVER => sub { $card->{driver} = $val }, KERNEL => sub { push(@{$card->{kernel}}, $val) }, + SCSIKERNEL => sub { push(@{$card->{scsikernel}}, $val) }, + USBKERNEL => sub { push(@{$card->{usbkernel}}, $val) }, + PARPORTKERNEL => sub { push(@{$card->{parportkernel}}, $val) }, UNSUPPORTED => sub { $card->{flags}{unsupported} = 1 }, MANUAL => sub { $card->{flags}{manual} = 1 }, MANUALREQUIRED => sub { $card->{flags}{manual} = 2 }, @@ -540,6 +543,7 @@ sub updateScannerDBfromSane { "Fujitsu Computer Products of America" => "Fujitsu", "HP" => sub { $_[0] =~ s/HP\s/Hewlett-Packard|/; $_[0] =~ s/HP4200/Hewlett-Packard|ScanJet 4200C/; $_[0] }, "Hewlett-Packard" => sub { $_[0] =~ s/HP 3200 C/Hewlett-Packard|ScanJet 3200C/ or $_[0] = "Hewlett-Packard|$_[0]"; $_[0] }, + "Hewlett Packard" => "Hewlett-Packard", "Kodak" => "Kodak Co.", "Mustek" => "Mustek Systems Inc.", "NEC" => "NEC Systems", |