public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: mgrac@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, STABLE2, updated. cluster-2.03.03-8-gdd97ff2 Date: Thu, 05 Jun 2008 15:46:00 -0000 [thread overview] Message-ID: <20080605154634.26203.qmail@sourceware.org> (raw) 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=dd97ff24427d02a2aea0057345cf8067334dcb3b The branch, STABLE2 has been updated via dd97ff24427d02a2aea0057345cf8067334dcb3b (commit) from f21cbeb482fad5eab16e2f14dc65dcd07d1afcaf (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 dd97ff24427d02a2aea0057345cf8067334dcb3b 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 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 23d151e..3d58dd5 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 4b5c41f..773bc83 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 d1bb17c..a0f5109 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
reply other threads:[~2008-06-05 15:46 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20080605154634.26203.qmail@sourceware.org \ --to=mgrac@sourceware.org \ --cc=cluster-cvs@sources.redhat.com \ --cc=cluster-devel@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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).