use ldetect-lst

2 files changed, 7 insertions, 4 deletions

diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 44bd8161b..f8e1a5cb3 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -167,7 +167,7 @@ Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN).
 Would you like to setup the Internet Connection Sharing?"), 1) or $in->exit(0);
 
 #my @pci_ethernet_cards;
-#require pci_probing::main;
+#OBSOLETE! require pci_probing::main;
 #($_->[0] =~ /NETWORK_ETHERNET/) and (push @pci_ethernet_cards, $_) foreach (pci_probing::main::probe('.'));
 
 #($#pci_ethernet_cards == -1) and $in->ask_warn('', _("No PCI network ethernet devices found!")) and $in->exit(0);
@@ -549,6 +549,9 @@ $in->exit(0);
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.18  2000/12/16 16:13:34  prigaux
+#- use ldetect-lst
+#-
 #- Revision 1.17  2000/11/13 15:48:33  gc
 #- Integrate Till's patches for better work with Cups.
 #-
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 397a1f12a..27bbc8f9a 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -4,6 +4,7 @@ use lib qw(/usr/lib/libDrakX);
 
 use common qw(:common :system);
 use interactive;
+use detect_devices;
 use mouse;
 use c;
 require 'dumpvar.pl';
@@ -29,9 +30,8 @@ if (!$mouse || !$::auto) {
     $mouse = mouse::fullname2mouse($name);
 
     if ($mouse->{device} eq "usbmouse") {
-	require pci_probing::main;
-	my ($c) = pci_probing::main::probe("serial_usb") or die _("no serial_usb found\n");
-	eval { modules::load($c->[1], "serial_usb") };
+	my ($c) = grep { $_->{driver} =~ /usb-[ou]hci/ } detect_devices::pci_probe(0) or die _("no serial_usb found\n");
+	eval { modules::load($c->{driver}, "serial_usb") };
     }
 }
 $mouse->{XEMU3} = 'yes' if $mouse->{nbuttons} < 3 && (!$::noauto || $in->ask_yesorno('', _("Emulate third button?"), 1));