Really use the hostname, otherwise ambiguous

"hostname" can return either the hostname or the fqdn depending on
configuration.
This refers to the issue http://tracker.ceph.com/issues/6706

Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/src/init-radosgw b/src/init-radosgw
index 1468c4bcdfd90002756083691adaf8fa5cb1b141..ad8bcd12835b58f91003eb108078f8ccfa7d53c5 100644 (file)
--- a/src/init-radosgw
+++ b/src/init-radosgw
@@ -40,7 +40,7 @@ case "$1" in
 
             # mapped to this host?
             host=`ceph-conf -n $name host`
-            if [ "$host" != `hostname` ]; then
+            if [ "$host" != `hostname -s` ]; then
                 continue
             fi
 

diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv
index cba99aff18f34b399cc97ba8ee92a0b7a273a0c4..43b321bd88ee90fd25bf4639374b5b211702578c 100644 (file)
--- a/src/init-radosgw.sysv
+++ b/src/init-radosgw.sysv
@@ -43,7 +43,7 @@ case "$1" in
 
             # mapped to this host?
             host=`ceph-conf -n $name host`
-            if [ "$host" != `hostname` ]; then
+            if [ "$host" != `hostname -s` ]; then
                 continue
             fi