summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-07-22 21:23:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-07-22 21:23:57 +0000
commitec88df0a7b7659d4c096a4c5540b28db816d7205 (patch)
treec612a1160c6c704e3dce447e859d3a97a3623d51 /perl-install/detect_devices.pm
parent8f2f272a88956ddffb83bffdf2a903712a6ef9da (diff)
downloaddrakx-backup-do-not-use-ec88df0a7b7659d4c096a4c5540b28db816d7205.tar
drakx-backup-do-not-use-ec88df0a7b7659d4c096a4c5540b28db816d7205.tar.gz
drakx-backup-do-not-use-ec88df0a7b7659d4c096a4c5540b28db816d7205.tar.bz2
drakx-backup-do-not-use-ec88df0a7b7659d4c096a4c5540b28db816d7205.tar.xz
drakx-backup-do-not-use-ec88df0a7b7659d4c096a4c5540b28db816d7205.zip
when $::noauto, hardwire no probing in detect_devices::probeall to ensure no probing is never done
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm3
1 files changed, 3 insertions, 0 deletions
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();
}