Do not restart network if the installation has been started via a SSH…

… connection
yast · Jul 14, 2014 · 9fe5f35 · 9fe5f35
1 parent d6c05ed
commit 9fe5f35
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb
@@ -616,11 +616,15 @@ def Write
             )
           )
         end
-
-        if LanItems.force_restart
-          NetworkService.Restart
-        else
-          NetworkService.ReloadOrRestart
+        unless Linuxrc.usessh
+          # Second stage has been called by yast.ssh via
+          # ssh. So we should not restart network cause systemctl
+          # hangs in that case. (bnc#885640)
+          if LanItems.force_restart
+            NetworkService.Restart
+          else
+            NetworkService.ReloadOrRestart
+          end
         end
         Builtins.sleep(sl)
       end