when $::noauto, hardwire no probing in detect_devices::probeall to ensure no probing is never done

4 files changed, 6 insertions, 3 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index e28084f4e..0f472748c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -641,7 +641,7 @@ sub load_category {
     my ($in, $category, $auto, $at_least_one) = @_;
 
     my @l;
-    if (!$::noauto) {
+    {
 	my $w;
 	my $wait_message = sub { $w = wait_load_module($in, $category, @_) };
 	@l = modules::load_category($category, $wait_message);
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 0c4b2f82e..c8fbc762d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -379,6 +379,9 @@ sub pcmcia_probe {
 # => probeall with $probe_type is unsafe
 sub probeall {
     my ($probe_type) = @_;
+
+    return if $::noauto;
+
     require sbus_probing::main;
     pci_probe($probe_type), usb_probe(), pcmcia_probe(), sbus_probing::main::probe();
 }
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 69afd5dff..8d159f9ec 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -499,7 +499,7 @@ sub main {
     require"install_steps_$o->{interactive}.pm" if $o->{interactive}; #- no space to skip perl2fcalls
 
     #- needed before accessing floppy (in case of usb floppy)
-    $::noauto or modules::load_category('bus/usb'); 
+    modules::load_category('bus/usb'); 
 
     #- patch should be read after defcfg in order to take precedance.
     eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg;
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index b91234301..36ab50960 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -319,7 +319,7 @@ sub detect() {
 			MOUSETYPE  => "Microsoft",
 			XMOUSETYPE => "Microsoft"}, @wacom;
 
-    if (!modules::get_probeall("usb-interface") && detect_devices::is_a_recent_computer() && $::isInstall && !$::noauto) {
+    if (!modules::get_probeall("usb-interface") && detect_devices::is_a_recent_computer() && $::isInstall) {
 	#- 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)