diff options
| author | bz <bz@FreeBSD.org> | 2009-01-25 10:31:45 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2009-01-25 10:31:45 +0000 |
| commit | fab213569d4abe1b3f77a508ee755fc9ffc13a23 (patch) | |
| tree | 657ebcdd6d6cc1998d440c086028fcdc55c38684 /etc/rc.shutdown | |
| parent | 6dddd783411fa0cbeeaea41c84e34d0d1b4c03f5 (diff) | |
| download | FreeBSD-src-fab213569d4abe1b3f77a508ee755fc9ffc13a23.zip FreeBSD-src-fab213569d4abe1b3f77a508ee755fc9ffc13a23.tar.gz | |
Instead of killing the 'watchdog' subshell and leaving a sleep for
rcshutdown_timeout (normally 30s) around re-parented to init, make
sure both go away using pkill -P.
While noone normally notices this for the system shutdown, it helps for
cleanly shutting down trusted jails.
Found without a killall in the base system, which in rc.d/jail normally
ensures that all processes of a jail to be stopped will be killed.
Reviewed by: silence on current@
MFC after: 4 weeks
Diffstat (limited to 'etc/rc.shutdown')
| -rw-r--r-- | etc/rc.shutdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/rc.shutdown b/etc/rc.shutdown index ebe79d7..dc1ca13 100644 --- a/etc/rc.shutdown +++ b/etc/rc.shutdown @@ -98,7 +98,7 @@ done # Terminate the background watchdog timer (if it is running) # if [ -n "$_rcshutdown_watchdog" ]; then - kill -TERM $_rcshutdown_watchdog >/dev/null 2>&1 + pkill -TERM -P $_rcshutdown_watchdog >/dev/null 2>&1 fi # Insert other shutdown procedures here |
