[node-patches] Change in ovirt-node[master]: [DRAFT] Pull in more dracut fixes

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: [DRAFT] Pull in more dracut fixes
......................................................................

[DRAFT] Pull in more dracut fixes

Change-Id: Id427efc9b63c491ca69adb7a16b174ab3c85f182
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M recipe/rhevh7-post.ks
1 file changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/95/35395/1

diff --git a/recipe/rhevh7-post.ks b/recipe/rhevh7-post.ks
index 12cf2e5..60fa05a 100644
--- a/recipe/rhevh7-post.ks
+++ b/recipe/rhevh7-post.ks
@@ -202,7 +202,7 @@
 _EOF_
 
 # udev patch for rhbz#1152948
-patch --ignore-whitespace -d /lib/udev/rules.d -p0 << \EOF_udev_patch
+patch --verbose --ignore-whitespace -d /lib/udev/rules.d -p0 << \EOF_udev_patch
 --- 62-multipath.rules.orig     2014-11-04 14:57:12.385999154 +0000
 +++ 62-multipath.rules  2014-11-04 14:58:19.081002175 +0000
 @@ -45,5 +45,5 @@
@@ -214,7 +214,8 @@
  LABEL="end_mpath"
 EOF_udev_patch
 
-patch --ignore-whitespace -d /usr/lib/dracut/ -p0 << \EOF_dracut
+# http://git.kernel.org/cgit/boot/dracut/dracut.git/commit/?id=d829e7fce273e9dbd8a71dbf71612556331f28fa
+patch --verbose --ignore-whitespace -d /usr/lib/dracut/ -p0 << \EOF_dracut
 --- modules.d/90dmsquash-live/dmsquash-live-genrules.sh
 +++ modules.d/90dmsquash-live/dmsquash-live-genrules.sh
 @@ -3,10 +3,10 @@
@@ -233,3 +234,20 @@
      wait_for_dev -n "${root#live:}"
    ;;
 EOF_dracut
+
+# https://git.kernel.org/cgit/boot/dracut/dracut.git/commit/?id=778b3543609d8c9d32df7111229f4072d00d02f0
+patch --verbose --ignore-whitespace -d /usr/lib/dracut/ -p0 << \EOF_dracut
+--- modules.d/90multipath/multipathd.sh
++++ modules.d/90multipath/multipathd.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-if [ -e /etc/multipath.conf ]; then
++if getargbool 1 rd.multipath -d -n rd_NO_MULTIPATH && [ -e /etc/multipath.conf ]; then
+     modprobe dm-multipath
+     multipathd -B || multipathd
+     need_shutdown
+EOF_dracut
+
+# Rebuild initramfs
+dracut -f


-- 
To view, visit http://gerrit.ovirt.org/35395
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id427efc9b63c491ca69adb7a16b174ab3c85f182
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>