summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-10-05 08:58:10 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-10-05 08:58:10 +0000
commitf5617761c22073ddd6ccbd3e556bc80955300352 (patch)
treea8706e87b461bf473101e2327bb1c0d9affdd702
parent384cf822a72ba52c63fcfb67f3387b49771cce5e (diff)
downloaddrakx-f5617761c22073ddd6ccbd3e556bc80955300352.tar
drakx-f5617761c22073ddd6ccbd3e556bc80955300352.tar.gz
drakx-f5617761c22073ddd6ccbd3e556bc80955300352.tar.bz2
drakx-f5617761c22073ddd6ccbd3e556bc80955300352.tar.xz
drakx-f5617761c22073ddd6ccbd3e556bc80955300352.zip
(getUPS) add proper support for "American Power Conversion|Back-UPS"
-rw-r--r--perl-install/detect_devices.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 02b5a36f4..c2560006c 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -570,7 +570,8 @@ sub getNet() {
sub getUPS() {
# MGE serial PnP devices:
- my @usb_devices = usb_probe();
+ my @usb_devices = map { ($_->{name} = $_->{description}) =~ s/.*\|// } usb_probe();
+
(map {
$_->{port} = $_->{DEVICE};
$_->{bus} = "Serial";
@@ -583,10 +584,9 @@ sub getUPS() {
# USB UPSs;
(grep { $_->{description} =~ /American Power Conversion\|Back-UPS/ } @usb_devices),
(map {
- ($_->{name} = $_->{description}) =~ s/.*\|//;
- $_->{port} = "auto";
+ $_->{port} = "/dev/hiddev0";
$_->{media_type} = 'UPS';
- $_->{driver} =~ s/^UPS://;
+ $_->{driver} = 'hidups';
$_;
} grep { $_->{driver} =~ /ups$/ } @usb_devices);
}