Merge branch 'SLE-12-SP2'

yast · Mar 24, 2017 · 168b013 · 168b013
2 parents 45903e7 + d30e841
commit 168b013
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,7 @@
 require "yast/rake"
 
+Yast::Tasks.submit_to :sle12sp2
+
 Yast::Tasks.configuration do |conf|
   #lets ignore license check for now
   conf.skip_license_check << /.*/

diff --git a/package/yast2-multipath.changes b/package/yast2-multipath.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 24 11:12:09 UTC 2017 - mfilka@suse.com
+
+- bnc#1026027
+  - removed calls to /sbin/insserv
+- 3.1.8 
+
 -------------------------------------------------------------------
 Mon Jun  6 16:29:48 UTC 2016 - igonzalezsosa@suse.com
 

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

diff --git a/src/include/multipath/complex.rb b/src/include/multipath/complex.rb
@@ -24,8 +24,6 @@
 # Summary:	Complex stuffs for multipath yast module
 # Authors:	Coly Li <coyli@novell.com>
 #
-# $Id: complex.ycp,v 1.49 2007/01/22 03:25:16 coly Exp $
-#
 # Compelx stuffs for multipath yast module, this file is included
 # by Multipath.ycp.
 module Yast
@@ -3627,21 +3625,6 @@ def Update_Service_Status
       nil
     end
 
-    def CallInsserv(on, name)
-      Builtins.y2milestone("CallInsserv on:%1 name:%2", on, name)
-      scrname = Ops.add("/etc/init.d/", name)
-      if Ops.greater_than(SCR.Read(path(".target.size"), scrname), 0)
-        cmd = "cd / && /sbin/insserv "
-        cmd = Ops.add(cmd, "-r ") if !on
-        cmd = Ops.add(cmd, scrname)
-        Builtins.y2milestone("CallInsserv cmd %1", cmd)
-        bo = Convert.to_map(SCR.Execute(path(".target.bash_output"), cmd))
-        Builtins.y2milestone("CallInsserv bo %1", bo)
-      end
-
-      nil
-    end
-
     def Start_Service
       return if @service_status == 1
       prop_info = _("Use multipath failed:") + "\n"
@@ -3668,7 +3651,6 @@ def Start_Service
           return
         end
       else
-        #		CallInsserv(true, "multipathd");
         Storage.ActivateMultipath(true)
       end
 
@@ -3705,7 +3687,6 @@ def Stop_Service
         end
       else
         Storage.ActivateMultipath(false) 
-        #		CallInsserv(false, "multipathd");
       end
 
       @service_status = 0