Accepting request 305873 from home:trenn:branches:Base:System

- Add fix for multipath systems without multipathd.conf
  bsc#927719: Tumbleweed Snapshot blocked: no multipath support in 20150416\
            (likely dracut issue)
  bsc#930019: multipath is broken in dracut due to missing /etc/multipath.conf
	    file (systemd multpath.service condition)
* Added patch: dracut_fix_multipath_without_config.patch

OBS-URL: https://build.opensuse.org/request/show/305873
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=218

dracut.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri May  8 06:30:32 UTC 2015 - trenn@suse.de
+
+- Add fix for multipath systems without multipathd.conf
+  bsc#927719: Tumbleweed Snapshot blocked: no multipath support in 20150416\
+            (likely dracut issue)
+  bsc#930019: multipath is broken in dracut due to missing /etc/multipath.conf
+	    file (systemd multpath.service condition)
+
+* Added patch: dracut_fix_multipath_without_config.patch
+
+
 -------------------------------------------------------------------
 Tue Mar 24 15:37:48 UTC 2015 - trenn@suse.de
 

dracut.spec

@@ -111,6 +111,9 @@ Patch134:       0134-Remove-bootdev-warning-bnc-881112.patch
 Patch145:       0145-40network-handle-ip-ifname-static-correctly.patch
 Patch162:       0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch
 
+# Submit mainline asap
+Patch200:       dracut_fix_multipath_without_config.patch
+
 BuildRequires:  asciidoc
 BuildRequires:  bash
 BuildRequires:  docbook-xsl-stylesheets
@@ -235,6 +238,8 @@ and its cryptography during startup.
 %patch168 -p1
 %patch170 -p1
 
+%patch200 -p1
+
 %build
 %configure\
   --systemdsystemunitdir=%{_unitdir}\

dracut_fix_multipath_without_config.patch

@@ -0,0 +1,29 @@
+From: Hannes Reinecke <hare@suse.de>
+
+If rootfs is on multipath, but platform does not have an /etc/multipath.conf
+file which is not urgently needed, they system will not boot, due to:
+
+multipathd is not started and rootfs and swap are not found:
+systemctl status multipathd.service
+* multipathd.service - Device-Mapper Multipath Device Controller
+   Loaded: loaded (/usr/lib/systemd/system/multipathd.service; disabled; vendor preset: enabled)
+   Active: inactive (dead)
+Condition: start condition failed at Thu 2015-05-07 11:49:11 CEST; 7min ago
+           ConditionPathExists=/etc/multipath.conf was not met
+
+
+and exit to dracut shell.
+
+
+Index: dracut-041/modules.d/90multipath/multipathd.service
+===================================================================
+--- dracut-041.orig/modules.d/90multipath/multipathd.service	2015-01-31 12:54:52.000000000 +0100
++++ dracut-041/modules.d/90multipath/multipathd.service	2015-05-08 08:13:22.714063510 +0200
+@@ -6,7 +6,6 @@
+ ConditionKernelCommandLine=!nompath
+ ConditionKernelCommandLine=!rd.multipath=0
+ ConditionKernelCommandLine=!rd_NO_MULTIPATH
+-ConditionPathExists=/etc/multipath.conf
+ 
+ [Service]
+ Type=simple