diff options
| author | Kurt J. Bosch <kjb-temp-2009@alpenjodel.de> | 2011-06-27 16:03:18 +0200 |
|---|---|---|
| committer | Kurt J. Bosch <kjb-temp-2009@alpenjodel.de> | 2011-06-28 15:39:42 +0200 |
| commit | 714ebaa6661be59e8d68c08bbdf09bbfb64ff210 (patch) | |
| tree | d804fed085cae5bd2e1c9103c49780eff0405b3f /functions | |
| parent | 49ba4ef0f1155d0d7ca267664adda3aaeb98364b (diff) | |
| download | initscripts-714ebaa6661be59e8d68c08bbdf09bbfb64ff210.tar.xz | |
functions: Simplify kill_everything() omit_pid handling
All credits go to: Dave Reisner <d@falconindy.com>
Diffstat (limited to 'functions')
| -rw-r--r-- | functions | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -289,16 +289,12 @@ kill_everything() { # Terminate all processes stat_busy "Sending SIGTERM To Processes" run_hook "$1_prekillall" - local pid k5args="" - for pid in ${omit_pids[@]}; do - k5args+=" -o $pid" - done - /sbin/killall5 -15 $k5args &>/dev/null + /sbin/killall5 -15 ${omit_pids[@]/#/-o } &>/dev/null /bin/sleep 5 stat_done stat_busy "Sending SIGKILL To Processes" - /sbin/killall5 -9 $k5args &>/dev/null + /sbin/killall5 -9 ${omit_pids[@]/#/-o } &>/dev/null /bin/sleep 1 stat_done |