Attachment 641523 Details for Bug 875064 – proposed patch

[patch] proposed patch

rgmanager-fs-agent.patch (text/plain), 1.33 KB, created by Josef Zimek on 2012-11-09 12:46:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Zimek

Created: 2012-11-09 12:46:07 UTC

Size: 1.33 KB

patch

obsolete

>--- ./fs.sh.orig	2012-11-08 16:41:17.000000000 +0100
>+++ ./fs.sh	2012-11-08 16:48:37.000000000 +0100
>@@ -38,6 +38,7 @@ YES=0
> NO=1
> YES_STR="yes"
> INVALIDATEBUFFERS="/bin/true"
>+RESOURCENAME=$(echo "$OCF_RESKEY_name" | sed -e "s/[[:space:]]/_/g")
> 
> #
> # Using a global to contain the return value saves
>@@ -560,7 +561,7 @@ mountInUse () {
> 	dev=$1
> 	mp=$2
> 
>-	typeset proc_mounts=$(mktemp /tmp/fs-$OCF_RESKEY_name.proc.mounts.XXXXXX)
>+	typeset proc_mounts=$(mktemp /tmp/fs-${RESOURCENAME}.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 +613,7 @@ isMounted () {
> 
> 	ret=$NO
> 
>-	typeset proc_mounts=$(mktemp /tmp/fs-$OCF_RESKEY_name.proc.mounts.XXXXXX)
>+	typeset proc_mounts=$(mktemp /tmp/fs-${RESOURCENAME}.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 +971,7 @@ Unknown file system type '$fstype' for d
> 	#
> 	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-${RESOURCENAME}.fsck.log.XXXXXX)
> 		ocf_log debug "Running fsck on $dev"
> 		fsck -p $dev >> $fsck_log 2>&1
> 		ret_val=$?

Actions: View | Diff

Attachments on bug 875064: 641523