From b1c02ced1714efa0919a6783a84fa6e769680b8d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 13 Apr 2009 10:19:47 -0700
Subject: [PATCH] vstart: behave a bit better when sudoing

---
 src/stop.sh   | 6 ++++--
 src/vstart.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/stop.sh b/src/stop.sh
index 7320476cfa6f5..6df108ca48aac 100755
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo"
+
 do_killall() {
 	pg=`pgrep -f crun.*$1`
 	[ "$pg" != "" ] && kill $pg
-	killall $1
+	$SUDO killall $1
 }
 
 usage="usage: $0 [all] [mon] [mds] [osd]\n"
@@ -40,7 +42,7 @@ done
 if [ $stop_all -eq 1 ]; then
 	killall cmon cmds cosd
 	pkill -f valgrind.bin.\*cmon
-	pkill -f valgrind.bin.\*cosd
+	$SUDO pkill -f valgrind.bin.\*cosd
 	pkill -f valgrind.bin.\*cmds
 else
 	[ $stop_mon -eq 1 ] && do_killall cmon
diff --git a/src/vstart.sh b/src/vstart.sh
index cbe52fbd19301..d9b5fa82cd0d6 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -116,7 +116,7 @@ $SUDO rm -f core*
 
 test -d out || mkdir out
 $SUDO rm -f out/*
-test -d log && rm log/*
+test -d log && rm -f log/*
 test -d gmon && $SUDO rm -rf gmon/*
 
 
-- 
2.39.5