summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-17 15:40:45 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-17 15:40:45 +0000
commit5e9bba26fc129a19225bbfdde80f1f012b7952b7 (patch)
treeee68f3d3c53d0e586f4638bc067e23e816832944
parent120b123ddec560eb85ccf6677c079764723685e3 (diff)
downloaddrakx-net-5e9bba26fc129a19225bbfdde80f1f012b7952b7.tar
drakx-net-5e9bba26fc129a19225bbfdde80f1f012b7952b7.tar.gz
drakx-net-5e9bba26fc129a19225bbfdde80f1f012b7952b7.tar.bz2
drakx-net-5e9bba26fc129a19225bbfdde80f1f012b7952b7.tar.xz
drakx-net-5e9bba26fc129a19225bbfdde80f1f012b7952b7.zip
always load module in thirdparty's apply_settings (so that thirdparty "sleep" setting is taken in account)
-rw-r--r--lib/network/thirdparty.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/network/thirdparty.pm b/lib/network/thirdparty.pm
index a2a4a5c..98bd9bb 100644
--- a/lib/network/thirdparty.pm
+++ b/lib/network/thirdparty.pm
@@ -331,8 +331,10 @@ sub apply_settings {
if (exists $settings->{firmware} && !$settings->{old_status}{firmware}) {
log::explanations("Reloading module $driver");
eval { modules::unload($driver) };
- eval { modules::load($driver) };
+ } else {
+ log::explanations("Loading module $driver");
}
+ eval { modules::load($driver) };
undef $wait;
$wait = $in->wait_message('', N("Please wait, running device configuration commands..."));