Merge pull request ceph#861 from dachary/init-ceph

init: fix typo s/{$update_crush/${update_crush/
dragonylffly · Nov 25, 2013 · b089adb · b089adb
2 parents 0b14c15 + 3502d4f
commit b089adb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/init-ceph.in b/src/init-ceph.in
@@ -317,7 +317,7 @@ for name in $what; do
 
 	    if [ "$type" = "osd" ]; then
 		get_conf update_crush "" "osd crush update on start"
-		if [ "${update_crush:-1}" = "1" -o "{$update_crush:-1}" = "true" ]; then
+		if [ "${update_crush:-1}" = "1" -o "${update_crush:-1}" = "true" ]; then
 		    # update location in crush
 		    get_conf osd_location_hook "$BINDIR/ceph-crush-location" "osd crush location hook"
 		    osd_location=`$osd_location_hook --cluster ceph --id $id --type osd`

diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
@@ -16,7 +16,7 @@ pre-start script
     install -d -m0755 /var/run/ceph
 
     update="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_update_on_start || :)"
-    if [ "${update:-1}" = "1" -o "{$update:-1}" = "true" ]; then
+    if [ "${update:-1}" = "1" -o "${update:-1}" = "true" ]; then
         # update location in crush
 	hook="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_location_hook || :)"
 	if [ -z "$hook" ]; then