summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-05-24 01:42:15 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-05-24 01:42:15 +0200
commitce5d7400b8213d2995bb96c4b80665082fde8975 (patch)
tree9bc3bed12d853e3046649113c7ccbb2ed684beaf
parent81392d0795b2d1987efb6dfdb5e0a991dd6124c8 (diff)
downloaddrakx-ce5d7400b8213d2995bb96c4b80665082fde8975.tar
drakx-ce5d7400b8213d2995bb96c4b80665082fde8975.tar.gz
drakx-ce5d7400b8213d2995bb96c4b80665082fde8975.tar.bz2
drakx-ce5d7400b8213d2995bb96c4b80665082fde8975.tar.xz
drakx-ce5d7400b8213d2995bb96c4b80665082fde8975.zip
fix detecting some UPS devices (mga#13424)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/detect_devices.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f27b2d917..64c4092d5 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- fix detecting some UPS devices (mga#13424)
+
Version 16.28 - 28 April 2014
- recognize new kernel-3.14 drivers
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 2e1a7c4d1..232664e73 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -950,7 +950,7 @@ sub getUPS() {
# USB UPSs;
(map { ($_->{name} = $_->{description}) =~ s/.*\|//; $_ }
map {
- if ($_->{description} =~ /^American Power Conversion\|Back-UPS/ && $_->{driver} eq 'usbhid') {
+ if ($_->{description} =~ /Back-UPS/ && $_->{driver} eq 'usbhid') {
#- FIXME: should not be hardcoded, use $_->{sysfs_device} . */usb:(hiddev\d+)
#- the device should also be assigned to the ups user
$_->{port} = "/dev/hiddev0";