summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-04-19 16:04:53 +0000
committerOlivier Blin <oblin@mandriva.org>2005-04-19 16:04:53 +0000
commit1e8ae805e03d2c4fe038d25185c9d05f25f9d314 (patch)
tree791022c48eacb9f017f41b46940ab3657c454350
parente0f4d280b956d5a21e58094d1ff3550881a35dee (diff)
downloaddrakx-backup-do-not-use-1e8ae805e03d2c4fe038d25185c9d05f25f9d314.tar
drakx-backup-do-not-use-1e8ae805e03d2c4fe038d25185c9d05f25f9d314.tar.gz
drakx-backup-do-not-use-1e8ae805e03d2c4fe038d25185c9d05f25f9d314.tar.bz2
drakx-backup-do-not-use-1e8ae805e03d2c4fe038d25185c9d05f25f9d314.tar.xz
drakx-backup-do-not-use-1e8ae805e03d2c4fe038d25185c9d05f25f9d314.zip
do not crash if modprobe fails
-rw-r--r--perl-install/network/tools.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 9c5ea152c..84b35a70b 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -305,9 +305,9 @@ sub ndiswrapper_available_drivers() {
}
sub ndiswrapper_setup() {
- modules::unload("ndiswrapper");
+ eval { modules::unload("ndiswrapper") };
#- unload ndiswrapper first so that the newly installed .inf files will be read
- modules::load("ndiswrapper");
+ eval { modules::load("ndiswrapper") };
#- FIXME: move this somewhere in get_eth_cards, so that configure_eth_aliases correctly writes ndiswrapper
#- find the first interface matching an ndiswrapper driver, try ethtool then sysfs