From f93e37d668b075efaf7aec941285d6a54e8d2aa8 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 30 Nov 2004 14:53:25 +0000 Subject: replace isStandalone with !isInstall (for finish-install which is neither isInstall nor isStandalone) --- perl-install/modules.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install') diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 63ec58a69..6bd0026b6 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -58,12 +58,12 @@ sub load_raw { my ($l, $h_options) = @_; if ($::testing) { log::l("i would load module $_ ($h_options->{$_})") foreach @$l; - } elsif ($::isStandalone || $::move) { + } elsif ($::isInstall && !$::move) { + load_raw_install($l, $h_options); + } else { run_program::run('/sbin/modprobe', $_, split(' ', $h_options->{$_})) or !run_program::run('/sbin/modprobe', '-n', $_) #- ignore missing modules or die "insmod'ing module $_ failed" foreach @$l; - } else { - load_raw_install($l, $h_options); } sleep 2 if any { /^(usb-storage|mousedev|printer)$/ } @$l; } -- cgit v1.2.1