diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-10-05 06:20:07 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-10-05 06:20:07 +0000 |
| commit | 456fa678aeabae4100b7a1121b77c947f3f80344 (patch) | |
| tree | 9fb5cec7baf69818c9b9c331ff4d91f8bda4d734 | |
| parent | 8d483b425f0a46466e3ee8cdb75fb2924c482001 (diff) | |
| download | drakx-456fa678aeabae4100b7a1121b77c947f3f80344.tar drakx-456fa678aeabae4100b7a1121b77c947f3f80344.tar.gz drakx-456fa678aeabae4100b7a1121b77c947f3f80344.tar.bz2 drakx-456fa678aeabae4100b7a1121b77c947f3f80344.tar.xz drakx-456fa678aeabae4100b7a1121b77c947f3f80344.zip | |
(getUPS) detect "American Power Conversion" UPS too
| -rw-r--r-- | perl-install/detect_devices.pm | 4 |
1 files changed, 3 insertions, 1 deletions
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'; |