From 456fa678aeabae4100b7a1121b77c947f3f80344 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 5 Oct 2004 06:20:07 +0000
Subject: (getUPS) detect "American Power Conversion" UPS too

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

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 74d09c887..099b9ca45 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -570,6 +570,7 @@ sub getNet() {
 
 sub getUPS() {
     # MGE serial PnP devices:
+    my @usb_devices = usb_probe();
     (map {
         $_->{port} = $_->{DEVICE};
         $_->{bus} = "Serial";
@@ -580,12 +581,13 @@ sub getUPS() {
         $_;
     } grep { $_->{DESCRIPTION} =~ /MGE UPS/ } values %serialprobe),
       # USB UPSs;
+      (grep { $->{description} =~ /American Power Conversion\|Back-UPS/ } @usb_devices),
       (map {
           ($_->{name} = $_->{description}) =~ s/.*\|//;
           $_->{port} = "/dev/"; # FIXME
           $_->{media_type} = 'UPS';
           $_;
-      } grep { $_->{driver} =~ /ups$/ } usb_probe());
+      } grep { $_->{driver} =~ /ups$/ } @usb_devices);
 }
 
 $pcitable_addons = <<'EOF';
-- 
cgit v1.2.1