From 524aee6f95f9c397b7c8508934f3c0577f9df1dd Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Fri, 1 Nov 2013 16:42:33 -0400 Subject: [PATCH] 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 Reviewed-by: Sage Weil --- src/init-radosgw | 2 +- src/init-radosgw.sysv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/init-radosgw b/src/init-radosgw index 1468c4bcdfd90..ad8bcd12835b5 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 cba99aff18f34..43b321bd88ee9 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 -- 2.39.5