Merge branch 'master' of builder:git/spark-rc

2017-01-03 22:45:28 +03:00
parent 6535b2b0e3 987c655fcc
commit 5b1dbee3ac
4 changed files with 54 additions and 4 deletions
--- a/rc.in
+++ b/rc.in
@@ -101,10 +101,10 @@ rc.services_stop() {

 rc.stop_everything() {
 	echo "Politely asking all processes to shut down..."
-	killall5 -15; sleep 3
+	killall5 -s 15 -w "$cfg_killall5_timeout"

 	echo "Killing the remaning ones..."
-	killall5 -9
+	killall5 -s 9
 }

 rc.unmount_everything() {