summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2002-02-04 22:17:11 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2002-02-04 22:17:11 +0000
commitbcc539482167d26f13832f17061aed7a4848fe8e (patch)
treeb8ba0fedc773743c46942b5024a210fd0c7a2459
parentc812ba64f35ce57dd44927b6b02d6a06f8f5d2ee (diff)
downloaddrakx-bcc539482167d26f13832f17061aed7a4848fe8e.tar
drakx-bcc539482167d26f13832f17061aed7a4848fe8e.tar.gz
drakx-bcc539482167d26f13832f17061aed7a4848fe8e.tar.bz2
drakx-bcc539482167d26f13832f17061aed7a4848fe8e.tar.xz
drakx-bcc539482167d26f13832f17061aed7a4848fe8e.zip
Replace "Hewlett-Packard" by "HP" when HP device is detected on a parallel port.
-rw-r--r--perl-install/detect_devices.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index a512efd49..7c33470ff 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -370,7 +370,13 @@ sub whatParport() {
open F, "/proc/parport/$_/autoprobe" or open F, "/proc/sys/dev/parport/parport$_/autoprobe" or next;
{
local $_;
- while (<F>) { $elem->{$1} = $2 if /(.*):(.*);/ }
+ while (<F>) {
+ if (/(.*):(.*);/) {
+ $elem->{$1} = $2;
+ $elem->{$1} =~ s/Hewlett[-\s_]Packard/HP/;
+ $elem->{$1} =~ s/HEWLETT[-\s_]PACKARD/HP/;
+ }
+ }
}
push @res, { port => "/dev/lp$_", val => $elem};
}