summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-12-16 16:13:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-12-16 16:13:34 +0000
commit3bf40616e233d127ecc0c1f90edd740d23a361ca (patch)
tree123688226f45977d93c97ab68635dfd492a5f54d /perl-install/standalone
parente76ac94274b3c3e3bb809f9a73718a56e652631b (diff)
downloaddrakx-3bf40616e233d127ecc0c1f90edd740d23a361ca.tar
drakx-3bf40616e233d127ecc0c1f90edd740d23a361ca.tar.gz
drakx-3bf40616e233d127ecc0c1f90edd740d23a361ca.tar.bz2
drakx-3bf40616e233d127ecc0c1f90edd740d23a361ca.tar.xz
drakx-3bf40616e233d127ecc0c1f90edd740d23a361ca.zip
use ldetect-lst
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/drakgw5
-rwxr-xr-xperl-install/standalone/mousedrake6
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));