diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2019-12-07 00:33:08 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2019-12-07 00:33:08 +0000 |
| commit | 7424699c9f94f9ba8ae6991b54608cfc3401a152 (patch) | |
| tree | ab589ae048da1616bf30a740f21e3845117db108 /libexec/rc | |
| parent | ff326a187907ebc1d6ebb6b0d40caf1137e20377 (diff) | |
| download | src-7424699c9f94f9ba8ae6991b54608cfc3401a152.tar.gz src-7424699c9f94f9ba8ae6991b54608cfc3401a152.zip | |
rc.shutdown: kill shutdown process after logging message
Move the kill -KILL $$ back to the pre-r354446 location at the end of
the shutdown timeout handler.
MFC with: r354446
Notes
Notes:
svn path=/head/; revision=355476
Diffstat (limited to 'libexec/rc')
| -rw-r--r-- | libexec/rc/rc.shutdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libexec/rc/rc.shutdown b/libexec/rc/rc.shutdown index f8cdade4423a..704546b1fb2a 100644 --- a/libexec/rc/rc.shutdown +++ b/libexec/rc/rc.shutdown @@ -69,13 +69,13 @@ _rcshutdown_watchdog= if [ -n "$rcshutdown_timeout" ]; then debug "Initiating watchdog timer." sleep $rcshutdown_timeout && ( - kill -KILL $$ >/dev/null 2>&1 _msg="$rcshutdown_timeout second watchdog" _msg="$_msg timeout expired. Shutdown terminated." logger -t rc.shutdown "$_msg" echo echo "$_msg" date + kill -KILL $$ >/dev/null 2>&1 ) & _rcshutdown_watchdog=$! fi |