diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-02-22 11:29:02 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-02-22 11:29:02 +0000 |
| commit | 212b01524f3940650f94e1d07b3dcf4a41806f03 (patch) | |
| tree | 603d1e6d15550807e68762445f35e5b734f2d7f4 /lib | |
| parent | 98b6ea605297615bc986403ef9cdd35415ddf544 (diff) | |
| download | drakx-net-212b01524f3940650f94e1d07b3dcf4a41806f03.tar drakx-net-212b01524f3940650f94e1d07b3dcf4a41806f03.tar.gz drakx-net-212b01524f3940650f94e1d07b3dcf4a41806f03.tar.bz2 drakx-net-212b01524f3940650f94e1d07b3dcf4a41806f03.tar.xz drakx-net-212b01524f3940650f94e1d07b3dcf4a41806f03.zip | |
allow not reloading the module if no_module_reload is set
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/network/thirdparty.pm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/network/thirdparty.pm b/lib/network/thirdparty.pm index 68f2d3b..20bd36b 100644 --- a/lib/network/thirdparty.pm +++ b/lib/network/thirdparty.pm @@ -332,13 +332,15 @@ sub apply_settings { install_packages($in, $settings, $driver, @thirdparty_types) or return; - if (exists $settings->{firmware} && !$settings->{old_status}{firmware}) { - log::explanations("Reloading module $driver"); - eval { modules::unload($driver) }; - } else { - log::explanations("Loading module $driver"); + if (!$settings->{no_module_reload}) { + if (exists $settings->{firmware} && !$settings->{old_status}{firmware}) { + log::explanations("Reloading module $driver"); + eval { modules::unload($driver) }; + } else { + log::explanations("Loading module $driver"); + } + eval { modules::load($driver) }; } - eval { modules::load($driver) }; undef $wait; $wait = $in->wait_message('', N("Please wait, running device configuration commands...")); |