From: Kefu Chai <kchai@redhat.com>
Date: Mon, 24 Jul 2017 08:38:13 +0000 (+0800)
Subject: vstart.sh: do not try to remove default asok_dir
X-Git-Tag: v12.1.2~154^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16523%2Fhead;p=ceph.git

vstart.sh: do not try to remove default asok_dir

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 1b63b62689fb3..8fb64f9910e64 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -343,7 +343,9 @@ else
     if [ "$new" -ne 0 ]; then
         # only delete if -n
         asok_dir=`dirname $($CEPH_BIN/ceph-conf --show-config-value admin_socket)`
-        [ -d $asok_dir ] && rm -f $asok_dir/* && rmdir $asok_dir
+        if [ $asok_dir != /var/run/ceph ]; then
+            [ -d $asok_dir ] && rm -f $asok_dir/* && rmdir $asok_dir
+        fi
         if [ -z "$CEPH_ASOK_DIR" ]; then
             CEPH_ASOK_DIR=`mktemp -u -d "${TMPDIR:-/tmp}/ceph-asok.XXXXXX"`
         fi