Accepting request 423235 from home:hreinecke:branches:Base:System

- Fixup module name in /usr/lib/modules-load.d (bsc#986734)

- multipath: fixup check from udev rules (bsc#986734)

- multipathd: start daemon after udev trigger (bsc#986734)
- Load device handler and multipath module at boot (bsc#991634)

- Do not check daemon from udev rules (bsc#986734,bsc#990538)

OBS-URL: https://build.opensuse.org/request/show/423235
OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=104

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/hreinecke/multipath-tools.git</param>
-    <param name="changesrevision">dcfa37d43f7c8eb1cd4f2f630c3cd4ca26022f11</param>
+    <param name="changesrevision">4abd547c2b2ba929f34183d6da768e4e239d6711</param>
   </service>
 </servicedata>

multipath-tools-0.6.2+suse20160805.dcfa37d.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c915157e9ecdc80b2c04a1bbf181a0f08ac997a2f2bb0c4456de4a567daeec6c
-size 188336

multipath-tools-0.6.2+suse20160826.4abd547.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:685346f69b4707d08658eafda58c0363b2397538e786eec30ffa3bcfad8a44df
+size 188280

multipath-tools.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Aug 26 18:52:03 CEST 2016 - hare@suse.de
+
+- Fixup module name in /usr/lib/modules-load.d (bsc#986734)
+
+-------------------------------------------------------------------
+Fri Aug 26 09:10:50 CEST 2016 - hare@suse.de
+
+- multipath: fixup check from udev rules (bsc#986734)
+
+-------------------------------------------------------------------
+Wed Aug 24 12:58:32 CEST 2016 - hare@suse.de
+
+- multipathd: start daemon after udev trigger (bsc#986734)
+- Load device handler and multipath module at boot (bsc#991634)
+
+-------------------------------------------------------------------
+Fri Aug 19 15:28:48 CEST 2016 - hare@suse.de
+
+- Do not check daemon from udev rules (bsc#986734,bsc#990538)
+
 -------------------------------------------------------------------
 Fri Aug  5 09:02:21 CEST 2016 - hare@suse.de
 

multipath-tools.spec

@@ -16,7 +16,7 @@
 #
 
 
-%define version_unconverted 0.6.2+suse20160805.dcfa37d
+%define version_unconverted 0.6.2+suse20160826.4abd547
 
 Name:           multipath-tools
 BuildRequires:  device-mapper-devel
@@ -31,7 +31,7 @@ Url:            http://christophe.varoqui.free.fr/
 Requires:       device-mapper >= 1.2.78
 Requires:       kpartx
 PreReq:         %insserv_prereq %fillup_prereq coreutils grep
-Version:        0.6.2+suse20160805.dcfa37d
+Version:        0.6.2+suse20160826.4abd547
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 License:        GPL-2.0
@@ -41,6 +41,7 @@ Group:          System/Base
 #FIXME: https://github.com/hreinecke/multipath-tools.git needs to
 #be moved to SUSE namespace
 Source:         multipath-tools-%{version}.tar.xz
+Source1:        multipath.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %suse_version > 1220
 %define         _sysdir usr/lib
@@ -95,6 +96,8 @@ rm $RPM_BUILD_ROOT/%_lib/libmpathcmd.so
 rm $RPM_BUILD_ROOT/%_lib/libmultipath.so
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcmultipathd
+mkdir -p $RPM_BUILD_ROOT/usr/lib/modules-load.d
+install -m 644 -D %{SOURCE1} "%buildroot/usr/lib/modules-load.d/multipath.conf"
 
 %pre
 [ -f /.buildenv ] && exit 0
@@ -144,6 +147,8 @@ exit 0
 %dir /%{_sysdir}/systemd/system
 /%{_sysdir}/systemd/system/multipathd.service
 /%{_sysdir}/systemd/system/multipathd.socket
+%dir /usr/lib/modules-load.d
+/usr/lib/modules-load.d/multipath.conf
 %{_mandir}/man8/multipath.8*
 %{_mandir}/man5/multipath.conf.5*
 %{_mandir}/man8/multipathd.8*

multipath.conf

@@ -0,0 +1,5 @@
+# Load device-handler and multipath module at boot
+scsi_dh_alua
+scsi_dh_emc
+scsi_dh_rdac
+dm_multipath