From: Sage Weil <sage@inktank.com>
Date: Fri, 22 Mar 2013 20:25:43 +0000 (-0700)
Subject: init-ceph: clean up temp ceph.conf filename on exit
X-Git-Tag: v0.56.4~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=901fa435bb4be29b72cec39e5ff77570d13cbc6c;p=ceph.git

init-ceph: clean up temp ceph.conf filename on exit

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit 6a7ad2eac1db6abca3d7edb23ca9b80751400a23)
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 0a0cb13546b5..8c1855a6aa0e 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -215,6 +215,7 @@ for name in $what; do
 	unique=`dd if=/dev/urandom bs=16 count=1 2>/dev/null | md5sum | awk '{print $1}'`
 	if echo $pushed_to | grep -v -q " $host "; then
 	    scp -q $conf $host:/tmp/ceph.conf.$unique
+	    trap "ssh $host rm /tmp/ceph.conf.$unique" EXIT
 	    pushed_to="$pushed_to $host "
 	fi
 	cur_conf="/tmp/ceph.conf.$unique"