Summary: | Space needed between "90 second watchdog..." and PID list when stopping jail. | ||
---|---|---|---|
Product: | Base System | Reporter: | Ryan <freebsd> |
Component: | bin | Assignee: | Ed Maste <emaste> |
Status: | Closed FIXED | ||
Severity: | Affects Only Me | CC: | emaste |
Priority: | --- | ||
Version: | 12.0-RELEASE | ||
Hardware: | amd64 | ||
OS: | Any |
Description
Ryan
2019-10-05 06:35:23 UTC
Proposed patch here: https://github.com/emaste/freebsd/commit/b06355c8190e11abc6274e5ffe34bb016d4b107b Please let me know what you prefer for "Reported by" metadata, for example Reported by: My Name <myname@example.com> A commit references this bug: Author: emaste Date: Thu Nov 7 15:48:46 UTC 2019 New revision: 354446 URL: https://svnweb.freebsd.org/changeset/base/354446 Log: rc.shutdown: print a newline before watchdog timeout message Previously the watchdog timeout message was appended to the last entry in the "Waiting for PIDS" list, resulting in a message like Waiting for PIDS: 31299 31296 90201 9020090 second watchdog timeout expired. Shutdown terminated. Print a newline to separate the watchdog timeout message. Also perform the kill before logging or echoing the message. PR: 241072 MFC after: 1 month Sponsored by: The FreeBSD Foundation Changes: head/libexec/rc/rc.shutdown A commit references this bug: Author: emaste Date: Sat Dec 7 03:29:58 UTC 2019 New revision: 355480 URL: https://svnweb.freebsd.org/changeset/base/355480 Log: MFC r354446: rc.shutdown: print a newline before watchdog timeout message Previously the watchdog timeout message was appended to the last entry in the "Waiting for PIDS" list, resulting in a message like Waiting for PIDS: 31299 31296 90201 9020090 second watchdog timeout expired. Shutdown terminated. Print a newline to separate the watchdog timeout message. Also MFC 355476: 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. PR: 241072 Sponsored by: The FreeBSD Foundation Changes: _U stable/12/ stable/12/libexec/rc/rc.shutdown |