use get_probeall instead of get_alias for usb-interface

4 files changed, 9 insertions, 5 deletions

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 4e5bff38b..30beca8b2 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -363,7 +363,7 @@ sub setDefaultPackages {
     $o->{compssUsersChoice}{DOCS} = !$o->{excludedocs};
     $o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners();
     $o->{compssUsersChoice}{DVD} = 1 if detect_devices::dvdroms();
-    $o->{compssUsersChoice}{USB} = 1 if modules::get_alias("usb-interface");
+    $o->{compssUsersChoice}{USB} = 1 if modules::get_probeall("usb-interface");
     $o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA();
     $o->{compssUsersChoice}{HIGH_SECURITY} = 1 if $o->{security} > 3;
     $o->{compssUsersChoice}{BIGMEM} = 1 if !$::oem && (availableRamMB() > 800) && (arch() !~ /ia64/);
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 6a87c4081..4f843b778 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -132,6 +132,10 @@ sub get_alias {
     my ($alias) = @_;
     $conf{$alias}{alias};
 }
+sub get_probeall {
+    my ($alias) = @_;
+    $conf{$alias}{probeall};
+}
 sub get_options {
     my ($name) = @_;
     $conf{$name}{options};
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 1ff8c106b..d6cdec3c1 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -263,7 +263,7 @@ sub detect() {
     my $fast_mouse_probe = sub {
 	my $auxmouse = detect_devices::hasMousePS2("psaux") && fullname2mouse("PS/2|Standard", unsafe => 1);
 
-	if (modules::get_alias("usb-interface")) {
+	if (modules::get_probeall("usb-interface")) {
 	    if (my (@l) = detect_devices::usbMice()) {
 		log::l("found usb mouse $_->{driver} $_->{description} ($_->{type})") foreach @l;
 		eval { modules::load(qw(hid mousedev usbmouse)) };
@@ -278,7 +278,7 @@ sub detect() {
 	$auxmouse;
     };
 
-    if (modules::get_alias("usb-interface")) {
+    if (modules::get_probeall("usb-interface")) {
 	my $keep_mouse;
 	if (my (@l) = detect_devices::usbWacom()) {
 	    log::l("found usb wacom $_->{driver} $_->{description} ($_->{type})") foreach @l;
@@ -319,7 +319,7 @@ sub detect() {
 			MOUSETYPE  => "Microsoft",
 			XMOUSETYPE => "Microsoft"}, @wacom;
 
-    if (!modules::get_alias("usb-interface") && detect_devices::is_a_recent_computer() && $::isInstall && !$::noauto) {
+    if (!modules::get_probeall("usb-interface") && detect_devices::is_a_recent_computer() && $::isInstall && !$::noauto) {
 	#- special case for non detected usb interface on a box with no mouse.
 	#- we *must* find out if there really is no usb, otherwise the box may
 	#- not be accessible via the keyboard (if the keyboard is USB)
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index b5a15c178..19aabd9b4 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -143,7 +143,7 @@ sub auto_detect {
     my ($in) = @_;
     {
 	my $w = $in->wait_message(_("Test ports"), _("Detecting devices..."));
-	modules::get_alias("usb-interface") and eval { modules::load("printer") };
+	modules::get_probeall("usb-interface") and eval { modules::load("printer") };
 	eval { modules::unload(qw(lp parport_pc parport_probe parport)) }; #- on kernel 2.4 parport has to be unloaded to probe again
 	eval { modules::load(qw(parport_pc lp parport_probe)); }; #- take care as not available on 2.4 kernel (silent error).
     }