[node-patches] Change in ovirt-node[master]: fix nfs kdump on iscsi root

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: fix nfs kdump on iscsi root
......................................................................

fix nfs kdump on iscsi root

rhbz#885960

Change-Id: I2bc1e20059e1fd668ff9dcd0353e6eff8fe6b329
Signed-off-by: Fabian Deutsch <fabiand at redhat.com>
---
M recipe/rhevh6-post.ks
1 file changed, 23 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/51/24751/1

diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks
index 522601d..d943575 100644
--- a/recipe/rhevh6-post.ks
+++ b/recipe/rhevh6-post.ks
@@ -194,3 +194,26 @@
 		count=4
 		remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r)
 EOF_functions
+
+patch -d /sbin -p0 << \EOF_mkdumprd
+--- mkdumprd.orig	2014-01-16 08:57:48.002090191 -0500
++++ mkdumprd	2014-01-16 08:58:29.419306913 -0500
+@@ -3634,7 +3634,7 @@
+                         #test nfs mount and directory creation
+                         rlocation=`echo $DUMP_TARGET | sed 's/.*:/'"$remoteip"':/'`
+                         tmnt=`mktemp -dq`
+-                        kdump_chk "mount -t $USING_METHOD -o nolock -o tcp $rlocation $tmnt" \
++                        kdump_chk "mount -n -t $USING_METHOD -o nolock -o tcp $rlocation $tmnt" \
+                                    "Bad NFS mount $DUMP_TARGET"
+                         kdump_chk "mkdir -p $tmnt/$SAVE_PATH" "Read only NFS mount $DUMP_TARGET"
+                         kdump_chk "touch $tmnt/$SAVE_PATH/testfile" "Read only NFS mount $DUMP_TARGET"
+@@ -3645,7 +3645,7 @@
+                         available_size=$(df -P $tdir | tail -1 | tr -s ' ' ':' | cut -d: -f5)
+ 
+                         rm -rf $tdir
+-                        umount -f $tmnt
++                        umount -n -f $tmnt
+                         if [ $? != 0 ]; then
+                             rmdir $tmnt
+                             echo "Cannot unmount the temporary directory"
+EOF_mkdumprd


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc1e20059e1fd668ff9dcd0353e6eff8fe6b329
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
Gerrit-Reviewer: Joey Boggs <jboggs at redhat.com>