diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-30 14:53:07 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-30 14:53:07 +0000 |
| commit | 8725df2f1d2b57143578ce8135fc5aa20bc18025 (patch) | |
| tree | f313f3c21deca59efc6f558d3eb5d9738945f099 | |
| parent | c58d7cf3ea859cc1c767a40934bd65fd58fa3c3f (diff) | |
| download | drakx-8725df2f1d2b57143578ce8135fc5aa20bc18025.tar drakx-8725df2f1d2b57143578ce8135fc5aa20bc18025.tar.gz drakx-8725df2f1d2b57143578ce8135fc5aa20bc18025.tar.bz2 drakx-8725df2f1d2b57143578ce8135fc5aa20bc18025.tar.xz drakx-8725df2f1d2b57143578ce8135fc5aa20bc18025.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 e2b2e363c..f9d382767 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; } |