From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 27 Mar 2013 15:03:20 +0000 (+0100)
Subject: mkcephfs.in: cleanup rdir in MON case
X-Git-Tag: v0.62~165^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2cb9f96314e8bcb9860477ca3056dfce552e1f4c;p=ceph.git

mkcephfs.in: cleanup rdir in MON case

Remove $rdir in MON case of 'mkcephfs -a' as soon as it's no
longer needed.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 97851ee7bffd..92d657259ef7 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -505,6 +505,7 @@ if [ $allhosts -eq 1 ]; then
 	if [ -n "$ssh" ]; then
 	    echo collecting $name key
 	    scp -q $host:$rdir/key.$name $dir
+	    #cleanup no longer need rdir
 	    do_cmd "rm -r $rdir"
 	fi
     done
@@ -542,6 +543,11 @@ if [ $allhosts -eq 1 ]; then
 	fi
 	
 	do_root_cmd "$0 -d $rdir --init-daemon $name"
+
+	if [ -n "$ssh" ]; then
+	    #cleanup no longer need rdir
+	    do_cmd "rm -r $rdir"
+	fi
     done
 
     # admin keyring