From 212b01524f3940650f94e1d07b3dcf4a41806f03 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 22 Feb 2008 11:29:02 +0000
Subject: allow not reloading the module if no_module_reload is set

---
 lib/network/thirdparty.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'lib/network/thirdparty.pm')

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..."));
-- 
cgit v1.2.1