Merge pull request #336 from mchf/master

Merged SLE-12-SP1
yast · Feb 23, 2016 · 6452aae · 6452aae
2 parents c5f45c1 + c092261
commit 6452aae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 21 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Feb 21 21:15:02 UTC 2016 - mfilka@suse.com
+
+- bnc#960703
+  - network service setup moved into yast2-network package.
+- 3.1.169
+
 -------------------------------------------------------------------
 Wed Feb 17 16:03:56 UTC 2016 - cwh@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.168
+Version:        3.1.169
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -78,8 +78,8 @@ Requires:       yast2-proxy
 # Systemd default target and services
 Requires: yast2-services-manager
 
-# Yast::Remote
-Requires: yast2-network
+# Network service setup moved into yast2-network
+Requires: yast2-network >= 3.1.143
 
 # Only in inst-sys
 # Requires:	yast2-add-on

diff --git a/src/lib/installation/clients/network_finish.rb b/src/lib/installation/clients/network_finish.rb
@@ -35,13 +35,7 @@ class NetworkFinishClient < Client
     def main
       textdomain "installation"
 
-      Yast.import "Installation"
       Yast.import "ModulesConf"
-      Yast.import "Arch"
-      Yast.import "Linuxrc"
-      Yast.import "String"
-      Yast.import "NetworkService"
-      Yast.import "Lan"
 
       @ret = nil
       @func = ""
@@ -58,8 +52,6 @@ def main
       end
 
       Builtins.y2milestone("starting network_finish")
-      Builtins.y2debug("func=%1", @func)
-      Builtins.y2debug("param=%1", @param)
 
       if @func == "Info"
         return {
@@ -69,15 +61,6 @@ def main
           "when"  => [:installation, :autoinst]
         }
       elsif @func == "Write"
-
-        if Lan.UseNetworkManager
-          NetworkService.use_network_manager
-        else
-          NetworkService.use_wicked
-        end
-
-        NetworkService.EnableDisableNow
-
         Builtins.y2milestone("Save network configuration")
         WFM.CallFunction("save_network")
         # false == don't force
@@ -87,7 +70,6 @@ def main
         @ret = nil
       end
 
-      Builtins.y2debug("ret=%1", @ret)
       Builtins.y2milestone("network_finish finished")
       deep_copy(@ret)
     end