cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
From: Ryan McCabe <rmccabe@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH] rgmanager: Don't use the resource name in tmp file names
Date: Tue, 18 Sep 2012 09:56:33 -0400	[thread overview]
Message-ID: <20120918135629.GA6017@redhat.com> (raw)

Patch from  John Ruemker <jruemker@redhat.com>

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

Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
---
 rgmanager/src/resources/fs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/resources/fs.sh b/rgmanager/src/resources/fs.sh
index 147f246..e55e77f 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=$?
-- 
1.7.11.4



             reply	other threads:[~2012-09-18 13:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-18 13:56 Ryan McCabe [this message]
2012-09-18 17:51 ` [Cluster-devel] [PATCH] rgmanager: Don't use the resource name in tmp file names Lon Hohberger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120918135629.GA6017@redhat.com \
    --to=rmccabe@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).