[node-patches] Change in ovirt-node[master]: update dracut module patches in ovirt-node %post

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: update dracut module patches in ovirt-node %post
......................................................................

update dracut module patches in ovirt-node %post

rhbz#1031975

Signed-off-by: Joey Boggs <jboggs at redhat.com>
Change-Id: I0a41ec3179166b4d4653b68346acba40ca8acc6e
---
M dracut/Makefile.am
A dracut/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch
M ovirt-node.spec.in
3 files changed, 31 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/20/21720/1

diff --git a/dracut/Makefile.am b/dracut/Makefile.am
index 5bd8fe4..6782294 100644
--- a/dracut/Makefile.am
+++ b/dracut/Makefile.am
@@ -33,7 +33,6 @@
   ovirt-dracut.conf
 
 EXTRA_DIST = \
-  dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch \
-  dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch
+	dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch
 
 # vim: ts=2
diff --git a/dracut/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch b/dracut/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch
new file mode 100644
index 0000000..7e42340
--- /dev/null
+++ b/dracut/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch
@@ -0,0 +1,23 @@
+--- modules.d/90dmsquash-live/dmsquash-live-root.orig	2013-11-26 09:14:17.551005743 -0500
++++ modules.d/90dmsquash-live/dmsquash-live-root	2013-11-26 09:16:20.779000017 -0500
+@@ -25,17 +25,19 @@
+ overlay=$(getarg overlay)
+ 
+ # FIXME: we need to be able to hide the plymouth splash for the check really
+-[ -e $livedev ] & fs=$(blkid -s TYPE -o value $livedev)
++[ -e $livedev ] && fs=$(blkid -s TYPE -o value $livedev)
+ if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
+     check="yes"
+ fi
+ getarg check || check=""
+ if [ -n "$check" ]; then
++   [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
+     checkisomd5 --verbose $livedev || :
+     if [ $? -ne 0 ]; then
+ 	die "CD check failed!"
+ 	exit 1
+     fi
++    [ -x /bin/plymouth ] && /bin/plymouth --show-splash
+ fi
+ 
+ getarg ro && liverw=ro
diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in
index d364659..386c959 100644
--- a/ovirt-node.spec.in
+++ b/ovirt-node.spec.in
@@ -372,8 +372,8 @@
 
 # dracut patches for rhel6
 %if ! %{is_systemd}
-%{__install} -p -m0644 dracut/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch %{buildroot}%{app_root}
-%{__install} -p -m0644 dracut/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch %{buildroot}%{app_root}
+%{__install} -p -m0644 dracut/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch %{buildroot}%{app_root}
+
 %endif
 
 # python-augeas is not in RHEL-6
@@ -420,9 +420,9 @@
 %if ! %{is_systemd}
 # apply dracut fixes not in rhel6
 # rhbz#683330
-# dracut.git commits rediffed for dracut-004-53.el6
-patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch
-patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch
+# dracut.git commits rediffed for dracut-004-336.el6
+patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch
+
 %endif
 #use all hard-coded defaults for multipath
 # except for getuid_callout where we need to replace-whitespace on EL6
@@ -602,8 +602,8 @@
 # end i386 bits
 %{app_root}/syslinux-vesa-splash.jpg
 %if ! %{is_systemd}
-%{app_root}/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch
-%{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch
+%{app_root}/dracut-7ed4ff0636c74a2f819ad6e4f2ab4862.patch
+
 %endif
 
 %dir %{dracutdir}/91ovirtnode


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a41ec3179166b4d4653b68346acba40ca8acc6e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>