e96b4170d0
This change allows to specify a watchdog(9) timeout for a system shutdown. The timeout is activated when the watchdogd daemon is stopped. The idea is to a prevent any indefinite hang during late stages of the shutdown. The feature is implemented in rc.d/watchdogd, it builds upon watchdogd -x option. Note that the shutdown timeout is not actiavted when the watchdogd service is individually stopped by an operator. It is also not activated for the 'shutdown' to the single-user mode. In those cases it is assumed that the operator knows what they are doing and they have means to recover the system should it hang. Significant subchanges and implementation details: - the argument to rc.shutdown, completely unused before, is assigned to rc_shutdown variable that can be inspected by rc scripts - init(8) passes "single" or "reboot" as the argument, this is not changed - the argument is not mandatory and if it is not set then rc_shutdown is set to "unspecified" - however, the default jail management scripts and jail configuration examples have been updated to pass "jail" to rc.shutdown, just in case - the new timeout can be set via watchdogd_shutdown_timeout rc option - for consistency, the regular timeout can now be set via watchdogd_timeout rc option - watchdogd_shutdown_timeout and watchdogd_timeout override timeout specifications in watchdogd_flags - existing configurations, where the new rc options are not set, should keep working as before I am not particularly wed to any of the implementation specifics. I am open to changing or removing any of them as long as the provided functionality is the same (or very close) to the proposed one. For example, I think it can be implemented without using watchdogd -x, by means of watchdog(1) alone. In that case there would be a small window between stopping watchdogd and running watchdog, but I think that that is acceptable. Reviewed by: bcr (man page changes) MFC after: 5 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D21221
36 lines
989 B
Plaintext
36 lines
989 B
Plaintext
# $FreeBSD$
|
|
|
|
xxx {
|
|
host.hostname = "xxx.yyy"; # hostname
|
|
path = "/vm/xxx"; # root directory
|
|
|
|
exec.clean;
|
|
exec.system_user = "root";
|
|
exec.jail_user = "root";
|
|
|
|
#
|
|
# NB: Below 4-lines required
|
|
#
|
|
vnet;
|
|
# netgraph
|
|
vnet.interface = "ng0_xxx"; # vnet interface(s)
|
|
exec.prestart += "jng bridge xxx em0"; # bridge interface(s)
|
|
exec.poststop += "jng shutdown xxx"; # destroy interface(s)
|
|
# if_bridge
|
|
#vnet.interface = "e0b_xxx"; # vnet interface(s)
|
|
#exec.prestart += "jib addm xxx em0"; # bridge interface(s)
|
|
#exec.poststop += "jib destroy xxx"; # destroy interface(s)
|
|
|
|
# Standard recipe
|
|
exec.start += "/bin/sh /etc/rc";
|
|
exec.stop = "/bin/sh /etc/rc.shutdown jail";
|
|
exec.consolelog = "/var/log/jail_xxx_console.log";
|
|
mount.devfs; # mount devfs
|
|
|
|
# Optional (default off)
|
|
#devfs_ruleset = "11"; # rule to unhide bpf for DHCP
|
|
#allow.mount; # mount /etc/fstab.xxx
|
|
#allow.set_hostname = 1; # Allow hostname to change
|
|
#allow.sysvipc = 1; # Allow SysV Interprocess Comm.
|
|
}
|