summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-11 18:19:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-11 18:19:20 +0000
commit090f4f7cc9f47b30df5c004f6d3b142ebcf5d92b (patch)
treeb1806334ee02ba3c77a0b5bd4a4ad6029f4fdff5
parentceeb918bc44eddf28247381486bbfc075ec91921 (diff)
downloaddrakx-backup-do-not-use-090f4f7cc9f47b30df5c004f6d3b142ebcf5d92b.tar
drakx-backup-do-not-use-090f4f7cc9f47b30df5c004f6d3b142ebcf5d92b.tar.gz
drakx-backup-do-not-use-090f4f7cc9f47b30df5c004f6d3b142ebcf5d92b.tar.bz2
drakx-backup-do-not-use-090f4f7cc9f47b30df5c004f6d3b142ebcf5d92b.tar.xz
drakx-backup-do-not-use-090f4f7cc9f47b30df5c004f6d3b142ebcf5d92b.zip
(load): when isStandalone, ignore errors when loading unavailable modules (ie have the same behaviour as during install)
-rw-r--r--perl-install/modules.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 8024d1c3d..5ca25a855 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -50,6 +50,7 @@ sub load {
log::l("i would load module $_ (@{$options{$_}})") foreach @l;
} elsif ($::isStandalone || $::live) {
run_program::run('/sbin/modprobe', $_, @{$options{$_}})
+ or !run_program::run('/sbin/modprobe', '-n', $_) #- ignore missing modules
or die "insmod'ing module $_ failed" foreach @l;
} else {
load_raw(map { [ $_ => $options{$_} ] } @l);