Set links up when probing interfaces during installation. See bnc#792…

…985. Setting interfaces up used to be side effect of NetHwDetection before. However this side effect was removed when fixing bnc#782283.
yast · Jan 31, 2013 · 03e7a1d · 03e7a1d
1 parent eea1bc5
commit 03e7a1d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/installation/inst_netprobe.ycp b/src/installation/inst_netprobe.ycp
@@ -13,13 +13,19 @@ textdomain "network";
 
 import "NetHwDetection";
 
+include "network/routines.ycp";
+
 y2milestone("----------------------------------------");
 y2milestone("Lan netprobe module started");
 y2milestone("Args: %1", WFM::Args());
 
 if(!NetHwDetection::running) 
 {
-    NetHwDetection::Start();
+    if( NetHwDetection::Start())
+    {
+        // Start interfaces iff running installation. See bnc#395014, bnc#782283 and bnc#792985
+        SetAllLinksUp();
+    }
 }
 
 y2milestone("Lan netprobe module finished");

diff --git a/src/modules/Lan.ycp b/src/modules/Lan.ycp
@@ -294,11 +294,7 @@ Check configuration manually."));
     {
         NetHwDetection::Start();
     }
-    // Start interfaces iff running installation. See bnc#395014 and bnc#782283
-    if( Mode::installation())
-    {
-        SetAllLinksUp();
-    }
+
     sleep(sl);
 
     if(Abort()) return false;