From: David Moreau Simard <dmsimard@iweb.com>
Date: Fri, 1 Nov 2013 20:42:33 +0000 (-0400)
Subject: Really use the hostname, otherwise ambiguous
X-Git-Tag: v0.73~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=524aee6f95f9c397b7c8508934f3c0577f9df1dd;p=ceph.git

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 1468c4bcdfd9..ad8bcd12835b 100644
--- 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 cba99aff18f3..43b321bd88ee 100644
--- 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