From 75016caba5642011f8c3b321bcde5b36680d7c95 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 24 Oct 2019 21:25:59 -0500
Subject: [PATCH] ceph-daemon: fix pathify (fix shell --config/--keyring)

The relative path works on one of my machines but not my laptop; the
full CWD works everywhere.  This is presumably better anyway!

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/ceph-daemon | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 6d64d9c740c..4d079199bec 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -147,8 +147,8 @@ def call_throws(command, **kwargs):
 ##################################
 
 def pathify(p):
-    if '/' not in p:
-        return './' + p
+    if not p.startswith('/'):
+        return os.path.join(os.getcwd(), p)
     return p
 
 def get_hostname():
-- 
2.39.5