Merge pull request #70 from aschnell/master

- enable multipathd via systemd instead of insserv (bnc#878329)
yast · May 19, 2014 · 69fa338 · 69fa338
2 parents 9d0274c + f4a3150
commit 69fa338
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,8 +1,14 @@
+-------------------------------------------------------------------
+Mon May 19 12:03:07 CEST 2014 - aschnell@suse.de
+
+- enable multipathd via systemd instead of insserv (bnc#878329)
+- version 3.1.25
+
 -------------------------------------------------------------------
 Mon May 12 11:14:45 CEST 2014 - aschnell@suse.de
 
 - flush /etc/sysconfig/yast2 after enabling use of snapper
-- version 3.1.23
+- version 3.1.24
 
 -------------------------------------------------------------------
 Wed May 07 18:12:42 CEST 2014 - aschnell@suse.de

diff --git a/package/yast2-storage.spec b/package/yast2-storage.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-storage
-Version:        3.1.24
+Version:        3.1.25
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -29,7 +29,7 @@ License:	GPL-2.0
 BuildRequires:	gcc-c++ libtool
 BuildRequires:	docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files
 BuildRequires:	libstorage-devel >= 2.25.10
-BuildRequires:  yast2 >= 2.19.4
+BuildRequires:  yast2 >= 3.1.22
 BuildRequires:  yast2-core-devel >= 2.23.1
 BuildRequires:  yast2-devtools >= 3.1.10
 BuildRequires:	yast2-testsuite >= 2.19.0
@@ -39,7 +39,9 @@ BuildRequires:	libstorage-ruby >= 2.25.10
 BuildRequires:  yast2-ruby-bindings >= 3.1.7
 Requires:	libstorage5 >= 2.25.10
 Requires:	libstorage-ruby >= 2.25.10
-Requires:	yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7
+Requires:	yast2-core >= 2.18.3
+Requires:	yast2 >= 3.1.22
+Requires:	yast2-libyui >= 2.18.7
 Requires:	rubygem-ruby-dbus
 %ifarch s390 s390x
 Requires:	yast2-s390

diff --git a/src/modules/Storage.rb b/src/modules/Storage.rb
@@ -56,6 +56,7 @@ def main
       Yast.import "String"
       Yast.import "Hotplug"
       Yast.import "ProductFeatures"
+      Yast.import "Service"
 
       # simple resize functionality - dialog to set size of Linux and Windows before proposal
 
@@ -6532,8 +6533,7 @@ def FinishInstall
 
       CallInsserv(need_md, "boot.md")
       CallInsserv(need_dmraid, "boot.dmraid")
-      CallInsserv(need_dmmultipath, "boot.multipath")
-      CallInsserv(need_dmmultipath, "multipathd")
+      Service.Enable("multipathd") if need_dmmultipath
 
       Builtins.y2milestone("FinishInstall done")