From bcc539482167d26f13832f17061aed7a4848fe8e Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Mon, 4 Feb 2002 22:17:11 +0000
Subject: Replace "Hewlett-Packard" by "HP" when HP device is detected on a
 parallel port.

---
 perl-install/detect_devices.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install/detect_devices.pm')

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};
     }
-- 
cgit v1.2.1