From c3ca7ad40ccc4d20749447d7db3d8593f4fd5ed6 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 2 Aug 2016 14:13:18 -0400 Subject: [PATCH] vstart.sh: only delete conf if -n src/test/ceph_objectstore_tool.py depends on an implicit "-k" when not creating a new cluster. (Deleting the conf file without -n makes no sense anyway.) Signed-off-by: Patrick Donnelly --- src/vstart.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vstart.sh b/src/vstart.sh index 4f071270299f..6096b372cdfb 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -290,7 +290,13 @@ if [ "$overwrite_conf" -eq 0 ]; then RGW=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_rgw 2>/dev/null` && \ CEPH_NUM_RGW="$RGW" else - [ -e "$conf_fn" ] && rm -- "$conf_fn" + if [ "$new" -ne 0 ]; then + # only delete if -n + [ -e "$conf_fn" ] && rm -- "$conf_fn" + else + # -k is implied... (doesn't make sense otherwise) + overwrite_conf=0 + fi fi if [ "$start_all" -eq 1 ]; then -- 2.47.3