[node-patches] Change in ovirt-node[ovirt-3.5]: Wait to trigger udev until multipath settles

[fabiand at redhat.com]

Hello Ryan Barry,

I'd like you to do a code review.  Please visit

    http://gerrit.ovirt.org/35850

to review the following change.

Change subject: Wait to trigger udev until multipath settles
......................................................................

Wait to trigger udev until multipath settles

See:
http://git.kernel.org/cgit/boot/dracut/dracut.git/commit/?id=d829e7fce273e9dbd8a71dbf71612556331f28fa

Change-Id: I71dc86c7831b5e31b8d3b89d6a014bbd0ccc57a1
Signed-off-by: Ryan Barry <rbarry at redhat.com>
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M recipe/rhevh7-post.ks
1 file changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/50/35850/1

diff --git a/recipe/rhevh7-post.ks b/recipe/rhevh7-post.ks
index 7515430..39fe0af 100644
--- a/recipe/rhevh7-post.ks
+++ b/recipe/rhevh7-post.ks
@@ -214,6 +214,27 @@
  LABEL="end_mpath"
 EOF_udev_patch
 
+
+patch --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 @@
+ case "$root" in
+   live:/dev/*)
+     {
+-        printf 'KERNEL=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+-            ${root#live:/dev/}
+-        printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \
+-            ${root#live:/dev/}
++        printf 'KERNEL=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root %s"\n' \
++            "${root#live:/dev/}" "${root#live:}"
++        printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root %s"\n' \
++            "${root#live:/dev/}" "${root#live:}"
+     } >> /etc/udev/rules.d/99-live-squash.rules
+     wait_for_dev -n "${root#live:}"
+   ;;
+EOF_dracut
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=1167620
 cat <<EOF_mpath >> /etc/multipath.conf
 
@@ -221,3 +242,4 @@
         find_multipaths yes
 }
 EOF_mpath
+


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I71dc86c7831b5e31b8d3b89d6a014bbd0ccc57a1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Fabian Deutsch <fabiand at redhat.com>
Gerrit-Reviewer: Ryan Barry <rbarry at redhat.com>