Commit Graph

21 Commits

Author SHA1 Message Date
Andriy Gapon
5fda0d60c1 add ability to set watchdog timeout for a shutdown
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
2019-10-03 11:23:10 +00:00
Devin Teske
3048255235 Fix jail examples in jib, jng, README
The provided example jail configs do not work for multiple interfaces.
Multiple interfaces need to be specified as a comma separated list or
using multiple += lines in jail.conf. In the given example, a space-
separated string is used, which doesn't work with multiple interfaces.

Also added a note to the README about VIMAGE being built-in by default
on amd64 in FreeBSD 12, with appropriate instructions for loading the
necessary netgraph ether module (ng_ether) since it is neither built-
in nor autoloads.

Submitted by:	Ryan Moeller <ryan@freqlabs.com>
Reported by:	Ryan Moeller <ryan@freqlabs.com>
MFC after:	3 days
Sponsored by:	Smule, Inc.
Differential Revision:	https://reviews.freebsd.org/D17697
2018-10-28 18:32:47 +00:00
Brad Davis
3f558d0b91 Attempt to make the parts that people are supposed to change stand out more
by capitalizing them.

Approved by:	dteske
2016-11-13 17:28:32 +00:00
Devin Teske
3ce83dbfcf Fix missing description for command usage
While "jng" or "jib" without arguments told you what each sub-command does,
sub-command usage didn't tell you (e.g., "jng bridge" or "jib addm" gave
only usage and not description).
2016-02-13 00:28:48 +00:00
Devin Teske
4b9a5d61f2 Comments and fix small bug
Reduce differences between jib/jng and fix a bug that would prevent
additional interfaces from being created if the first of many already
existed (counter wasn't incremented before calling only continue).
2016-02-12 02:53:44 +00:00
Devin Teske
1ccea30f71 Add syntax to disable MAC allocation
Adding `!' before an interface name will disable MAC allocation, falling
back to driver mechanics. Alternatively adding `=' before an interface name
causes the MAC address to be cloned (for ng_bridge(4) back-end only). While
here, disable the auto-detection of wlan* since this knocks the host off;
requiring the host that defines the jail to explicitly enable this feature
by preceding the interface with `='.
2016-02-12 01:41:40 +00:00
Devin Teske
78954c3be3 Refactor conversion to hex 2016-02-12 01:12:44 +00:00
Devin Teske
b35d45aadf Add support for bridging iwn(4) based wlan(4)
Documented in iwn(4), "Only one virtual interface may be configured at any
time." However, netgraph with a cloned MAC address is able to communicate
over an ng_eiface attached to an ng_bridge linked to the wlan(4) interface.
While here, introduce syntax to specify the MAC address is to be cloned if
the named interface begins with equals [=].
2016-02-11 22:10:54 +00:00
Devin Teske
7e4b7c797a Centralize MAC derivation formula 2016-02-11 21:28:34 +00:00
Devin Teske
e0c45153ac Add example VIMAGE config required by vnet jails 2016-02-11 18:37:02 +00:00
Devin Teske
39d9a52d99 Add `stats' command to get ng_bridge(4) stats 2016-02-10 04:56:38 +00:00
Devin Teske
abd0b26213 Add vnet jail configuration examples 2016-02-10 04:04:31 +00:00
Devin Teske
f2c27deaae Bring generated interfaces up always 2016-02-09 18:11:18 +00:00
Devin Teske
de6544a249 Change MAC algo to support mixing w/jng interfaces 2016-02-09 18:10:36 +00:00
Devin Teske
517ca8c0f1 Fix bpf unhiding example /etc/devfs.rules 2016-02-09 18:08:40 +00:00
Devin Teske
78a38b8f05 Adjust MAC algo to support interface branching 2016-02-09 01:41:03 +00:00
Devin Teske
43a45064a0 Adjust MAC allocation algo to support layering 2016-02-08 17:47:36 +00:00
Devin Teske
626ddc5125 Provide additional information on overall purpose 2016-02-08 17:36:46 +00:00
Devin Teske
0df549cba9 Fix copy/paste error; s/ngX/eXb/ 2016-02-08 17:30:17 +00:00
Devin Teske
7879db7636 Add two scripts for vnet jails
One for if_bridge(4) back-end, another for ng_bridge(4) back-end

Sponsored by:	FIS Global, Inc.
2016-02-07 16:41:54 +00:00
Julian Elischer
fa212bfbe6 Add two scripts that demonstrate how to make and
hook together jails using teh vortual networking feature.

Submitted by:	Yavuz Gokirmak
MFC after:	2 weeks
2010-10-24 22:59:38 +00:00