Cluster Project branch, RHEL5, updated. cmirror_1_1_15-112-g2ea27e1

[mgrac at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=2ea27e162b5a7b44ff2cef0443aa8e066af22347

The branch, RHEL5 has been updated
       via  2ea27e162b5a7b44ff2cef0443aa8e066af22347 (commit)
      from  c3cf128201d791f536a92f3512398985a6aa12a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2ea27e162b5a7b44ff2cef0443aa8e066af22347
Author: Marek 'marx' Grac <mgrac@redhat.com>
Date:   Thu Jun 5 17:44:33 2008 +0200

    Fixes #445662: names of resources with spaces are mishandled

-----------------------------------------------------------------------

Summary of changes:
 rgmanager/src/resources/named.sh      |    4 ++--
 rgmanager/src/resources/postgres-8.sh |    6 +++---
 rgmanager/src/resources/samba.sh      |   10 +++++-----
 rgmanager/src/resources/tomcat-5.sh   |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/rgmanager/src/resources/named.sh b/rgmanager/src/resources/named.sh
index 6d5c905..4fefd0d 100755
--- a/rgmanager/src/resources/named.sh
+++ b/rgmanager/src/resources/named.sh
@@ -87,9 +87,9 @@ generate_config_file()
 	clog_generate_config $CLOG_INIT "$original_file" "$generated_file"
 
 	generate_configTemplate "$generated_file" "$1"
-	cat $original_file | grep -v "^[[:space:]]*listen-on" | \
+	cat "$original_file" | grep -v "^[[:space:]]*listen-on" | \
 		grep -v "^[[:space:]]*pid-file" | \
-		grep -v "^[[:space:]]*directory" >> $generated_file
+		grep -v "^[[:space:]]*directory" >> "$generated_file"
 
 	declare tmp_file=`mktemp -t cluster.XXXXXXXXXX`
 	mv "$generated_file" "$tmp_file"
diff --git a/rgmanager/src/resources/postgres-8.sh b/rgmanager/src/resources/postgres-8.sh
index 8edc4a3..b75874e 100755
--- a/rgmanager/src/resources/postgres-8.sh
+++ b/rgmanager/src/resources/postgres-8.sh
@@ -102,10 +102,10 @@ generate_config_file()
 	done
 
 	generate_configTemplate "$generated_file" "$1"
-	echo "external_pid_file = '$PSQL_pid_file'" >> $generated_file
-	echo "listen_address = '$ip_comma'" >> $generated_file
+	echo "external_pid_file = '$PSQL_pid_file'" >> "$generated_file"
+	echo "listen_address = '$ip_comma'" >> "$generated_file"
 
-	echo >> $generated_file	
+	echo >> "$generated_file"	
 	sed 's/^[[:space:]]*external_pid_file/### external_pid_file/i;s/^[[:space:]]*listen_address/### listen_address/i' < "$original_file" >> "$generated_file"
 	
         sha1_addToFile "$generated_file"
diff --git a/rgmanager/src/resources/samba.sh b/rgmanager/src/resources/samba.sh
index 04c9841..70ea17f 100755
--- a/rgmanager/src/resources/samba.sh
+++ b/rgmanager/src/resources/samba.sh
@@ -89,11 +89,11 @@ generate_config_file()
 
 	generate_configTemplate "$generated_file" "$1"
 
-	echo "pid directory = \"$SAMBA_pid_dir\"" >> $generated_file
-	echo "interfaces = $ip_addresses" >> $generated_file
-	echo "bind interfaces only = Yes" >> $generated_file
-	echo "netbios name = \"$OCF_RESKEY_name\"" >> $generated_file
-	echo >> $generated_file	
+	echo "pid directory = \"$SAMBA_pid_dir\"" >> "$generated_file"
+	echo "interfaces = $ip_addresses" >> "$generated_file"
+	echo "bind interfaces only = Yes" >> "$generated_file"
+	echo "netbios name = \"$OCF_RESKEY_name\"" >> "$generated_file"
+	echo >> "$generated_file"	
 	sed 's/^[[:space:]]*pid directory/### pid directory/i;s/^[[:space:]]*interfaces/### interfaces/i;s/^[[:space:]]*bind interfaces only/### bind interfaces only/i;s/^[[:space:]]*netbios name/### netbios name/i' \
 	     < "$original_file" >> "$generated_file"
 	
diff --git a/rgmanager/src/resources/tomcat-5.sh b/rgmanager/src/resources/tomcat-5.sh
index 8571dcf..d085535 100755
--- a/rgmanager/src/resources/tomcat-5.sh
+++ b/rgmanager/src/resources/tomcat-5.sh
@@ -212,7 +212,7 @@ start()
 		return $OCF_ERR_GENERIC
 	fi
 	
-	echo $! > $TOMCAT_pid_file
+	echo $! > "$TOMCAT_pid_file"
 
 	clog_service_start $CLOG_SUCCEED
 


hooks/post-receive
--
Cluster Project