cluster: RHEL58 - rgmanager: Don't use the resource name in tmp file names

Gitweb: http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=9a98cfc8e11... Commit: 9a98cfc8e11273ca14135245132d9adc90dbd754 Parent: bdf0650eb61104933d76a4b74adc12c37ac3511a Author: Ryan McCabe <rmccabe(a)redhat.com&gt; AuthorDate: Tue Sep 18 09:52:59 2012 -0400 Committer: Ryan McCabe <rmccabe(a)redhat.com&gt; CommitterDate: Tue Sep 18 10:14:56 2012 -0400 rgmanager: Don't use the resource name in tmp file names Patch from John Ruemker <jruemker(a)redhat.com&gt; This patch fixes a regression in the fs resource agent that caused mktemp to fail to create a tmp file during status operations when the resource name contains the '/' character. Resolves: rhbz#858022 Acked-by: Fabio M. Di Nitto <fdinitto(a)redhat.com&gt; Signed-off-by: Ryan McCabe <rmccabe(a)redhat.com&gt; --- rgmanager/src/resources/fs.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rgmanager/src/resources/fs.sh b/rgmanager/src/resources/fs.sh index 7e6898c..225034b 100755 --- a/rgmanager/src/resources/fs.sh +++ b/rgmanager/src/resources/fs.sh @@ -560,7 +560,7 @@ mountInUse () { dev=$1 mp=$2 - typeset proc_mounts=$(mktemp /tmp/fs-$OCF_RESKEY_name.proc.mounts.XXXXXX) + typeset proc_mounts=$(mktemp /tmp/fs.proc.mounts.XXXXXX) cat /proc/mounts > $proc_mounts while read tmp_dev tmp_mp junka junkb junkc junkd; do if [ -n "$tmp_dev" -a "$tmp_dev" = "$dev" ]; then @@ -612,7 +612,7 @@ isMounted () { ret=$NO - typeset proc_mounts=$(mktemp /tmp/fs-$OCF_RESKEY_name.proc.mounts.XXXXXX) + typeset proc_mounts=$(mktemp /tmp/fs.proc.mounts.XXXXXX) cat /proc/mounts > $proc_mounts while read tmp_dev tmp_mp junk_a junk_b junk_c junk_d do @@ -970,7 +970,7 @@ Unknown file system type '$fstype' for device $dev. Assuming fsck is required." # if [ -n "$fsck_needed" ] || [ "${OCF_RESKEY_force_fsck}" = "yes" ] ||\ [ "${OCF_RESKEY_force_fsck}" = "1" ]; then - typeset fsck_log=$(mktemp /tmp/fs-$OCF_RESKEY_name.fsck.log.XXXXXX) + typeset fsck_log=$(mktemp /tmp/fs.fsck.log.XXXXXX) ocf_log debug "Running fsck on $dev" fsck -p $dev >> $fsck_log 2>&1 ret_val=$?