diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-30 14:53:25 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-30 14:53:25 +0000 |
| commit | f93e37d668b075efaf7aec941285d6a54e8d2aa8 (patch) | |
| tree | ed8218241e2882a55ceb401dfc634f227cf5b578 | |
| parent | c723693883eae605bf38ffdba46550d46bf3f3d3 (diff) | |
| download | drakx-f93e37d668b075efaf7aec941285d6a54e8d2aa8.tar drakx-f93e37d668b075efaf7aec941285d6a54e8d2aa8.tar.gz drakx-f93e37d668b075efaf7aec941285d6a54e8d2aa8.tar.bz2 drakx-f93e37d668b075efaf7aec941285d6a54e8d2aa8.tar.xz drakx-f93e37d668b075efaf7aec941285d6a54e8d2aa8.zip | |
replace isStandalone with !isInstall (for finish-install which is neither isInstall nor isStandalone)
| -rw-r--r-- | perl-install/modules.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |