From 56b91995d84ce935797975215e2a92032a27ea44 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 23 Mar 2009 15:17:21 -0700
Subject: [PATCH] initscript: make crun/valgrind init arguments override conf

---
 src/init-ceph | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/init-ceph b/src/init-ceph
index f4e0fef28fde2..c24cc9c023d7c 100755
--- a/src/init-ceph
+++ b/src/init-ceph
@@ -60,8 +60,8 @@ stop_daemon() {
 options=
 
 version=0
-dovalgrind=0
-docrun=0
+dovalgrind=
+docrun=
 allhosts=0
 debug=0
 monaddr=
@@ -157,10 +157,10 @@ for name in $what; do
 	    wrap=""
 	    runmode=""
 	    
-	    get_conf_bool crun "$docrun" "restart on core dump"
+	    [ -z "$crun" ] && get_conf_bool crun "0" "restart on core dump"
 	    [ "$crun" -eq 1 ] && wrap="$BINDIR/crun"
 	    
-	    get_conf_bool valgrind "$dovalgrind" "valgrind"
+	    [ -z "$dovalgrind" ] && get_conf_bool valgrind "0" "valgrind"
 	    [ "$valgrind" -eq 1 ] && wrap="$wrap valgrind"
 	    
 	    [ -n "$wrap" ] && runmode="-f &"
-- 
2.39.5