resource-agents: master - resource-agents: Apache resource with spaces in name fails to start

Marek Grác marx at fedoraproject.org
Mon Feb 7 13:27:03 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git;a=commitdiff;h=4ae988fa61afad242a870571622f4ab2aafadc31
Commit:        4ae988fa61afad242a870571622f4ab2aafadc31
Parent:        a23793faa3c7718177cbbda77363d5fd3765415d
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Mon Feb 7 14:12:47 2011 +0100
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Mon Feb 7 14:12:47 2011 +0100

resource-agents: Apache resource with spaces in name fails to start

Resolve: rhbz#667222
---
 rgmanager/src/resources/utils/config-utils.sh.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rgmanager/src/resources/utils/config-utils.sh.in b/rgmanager/src/resources/utils/config-utils.sh.in
index e3a44d0..2d461bb 100644
--- a/rgmanager/src/resources/utils/config-utils.sh.in
+++ b/rgmanager/src/resources/utils/config-utils.sh.in
@@ -8,7 +8,7 @@ declare -a ip_keys
 
 generate_configTemplate()
 {
-	cat > $1 << EOT
+	cat > "$1" << EOT
 #
 # "$1" was created from the "$2"
 #
@@ -34,8 +34,8 @@ sha1_verify()
 
 	ocf_log debug "Checking: SHA1 checksum of config file $oldFile"
 
-	sha1_new=`cat $oldFile | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
-	sha1_old=`tail -n 1 $oldFile | sed 's/^# rgmanager-sha1 \(.*\)$/\1/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
+	sha1_new=`cat "$oldFile" | grep -v "# rgmanager-sha1" | sha1sum | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
+	sha1_old=`tail -n 1 "$oldFile" | sed 's/^# rgmanager-sha1 \(.*\)$/\1/' | sed 's/^\([a-z0-9]\+\) .*$/\1/'`
 
 	if [ "$sha1_new" = "$sha1_old" ]; then
 	        ocf_log debug "Checking: SHA1 checksum > succeed"


More information about the cluster-commits mailing list