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

… connection
yast · Jul 14, 2014 · 2ceb23f · 2ceb23f
1 parent d6c05ed
commit 2ceb23f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 14 10:32:34 CEST 2014 - schubi@suse.de
+
+- Do not restart network if the installation has been started
+  via a SSH connection. (bnc#885640)
+- 3.1.89
+
 -------------------------------------------------------------------
 Fri Jul 11 08:52:08 UTC 2014 - mfilka@suse.com
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.68
+Version:        3.1.69
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb
@@ -620,7 +620,10 @@ def Write
         if LanItems.force_restart
           NetworkService.Restart
         else
-          NetworkService.ReloadOrRestart
+          # If the second installation stage has been called by yast.ssh via
+          # ssh, we should not restart network cause systemctl
+          # hangs in that case. (bnc#885640)
+          NetworkService.ReloadOrRestart if !Linuxrc.usessh
         end
         Builtins.sleep(sl)
       end