From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9074 invoked by alias); 5 Jun 2008 15:52:19 -0000 Received: (qmail 9020 invoked by uid 9650); 5 Jun 2008 15:52:19 -0000 Date: Thu, 05 Jun 2008 15:52:00 -0000 Message-ID: <20080605155218.8968.qmail@sourceware.org> From: mgrac@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-85-g89ec6ea X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: c272e736b0b3990954eb757f9cb41f9ef0810eb6 X-Git-Newrev: 89ec6eacf4619e0b72f72115ce7d93e83257fa7b Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00434.txt.bz2 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=89ec6eacf4619e0b72f72115ce7d93e83257fa7b The branch, RHEL4 has been updated via 89ec6eacf4619e0b72f72115ce7d93e83257fa7b (commit) from c272e736b0b3990954eb757f9cb41f9ef0810eb6 (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 89ec6eacf4619e0b72f72115ce7d93e83257fa7b Author: Marek 'marx' Grac Date: Thu Jun 5 17:44:33 2008 +0200 [FENCE] Resolves #450150: Resource names 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 b9dec73..8a8c2f4 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