[node-patches] Change in ovirt-node[master]: Stop trying to patch mkdumprd on 6.6 and above

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Stop trying to patch mkdumprd on 6.6 and above
......................................................................

Stop trying to patch mkdumprd on 6.6 and above

mkdumprd is better about detecting which devices are bridges, and
we don't need to patch it

Change-Id: Icced44728b59395299c643dbdf69fb114e530bbb
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M recipe/centos6-post.ks
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/97/34797/1

diff --git a/recipe/centos6-post.ks b/recipe/centos6-post.ks
index 55c93b8..30cdfb6 100644
--- a/recipe/centos6-post.ks
+++ b/recipe/centos6-post.ks
@@ -168,7 +168,11 @@
 echo "*        -       maxlogins      3" >> /etc/security/limits.conf
 
 # rhbz#738170
-patch -d /sbin -p0 << \EOF_mkdumprd
+# later versions use mkdumprd/kdump_is_bridge(), which is smarter about
+# detecting bridge devices (instead of just br*), and this patch is not
+# necessary
+if ! grep -q 6.6 /etc/system-release; then 
+    patch -d /sbin -p0 << \EOF_mkdumprd
 --- /sbin/mkdumprd.orig	2011-10-06 06:37:49.000000000 +0000
 +++ /sbin/mkdumprd	2011-11-01 04:21:19.000000000 +0000
 @@ -583,7 +583,7 @@
@@ -191,3 +195,4 @@
                  handlenetdev $j
 
 EOF_mkdumprd
+fi


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icced44728b59395299c643dbdf69fb114e530bbb
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>