summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-21 17:44:36 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-21 17:44:36 +0000
commit0861e10af07094ce724bdac0baa3a3d9d1c8cf89 (patch)
tree1a92bebf5b1084db9f941b489409ddc590bb43df
parent950cdbe5c28562bbb35fb59005e3d5ea4750a413 (diff)
downloaddrakx-backup-do-not-use-0861e10af07094ce724bdac0baa3a3d9d1c8cf89.tar
drakx-backup-do-not-use-0861e10af07094ce724bdac0baa3a3d9d1c8cf89.tar.gz
drakx-backup-do-not-use-0861e10af07094ce724bdac0baa3a3d9d1c8cf89.tar.bz2
drakx-backup-do-not-use-0861e10af07094ce724bdac0baa3a3d9d1c8cf89.tar.xz
drakx-backup-do-not-use-0861e10af07094ce724bdac0baa3a3d9d1c8cf89.zip
(getUPS) detect serial MGE too
-rw-r--r--perl-install/detect_devices.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 83c64ce5f..4439afd55 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -443,14 +443,15 @@ sub getUPS() {
return $ret == $usage ? 1 : 0;
};
- map {
+ (grep { $_->{DESCRIPTION} =~ /MGE UPS/ } values %serialprobe),
+ (map {
open(my $f, $_);
if_(!$hiddev_find_application->($f, $UPS_USAGE) && !$hiddev_find_application->($f, $POWER_USAGE),
{ port => $_,
name => c::get_usb_ups_name(fileno($f))
}
);
- } -e "/dev/.devfsd" ? glob("/dev/usb/hid/hiddev*") : glob("/dev/usb/hiddev*");
+ } -e "/dev/.devfsd" ? glob("/dev/usb/hid/hiddev*") : glob("/dev/usb/hiddev*"));
}
$pcitable_addons = <<'EOF';