summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-02-28 20:56:35 +0000
committerphk <phk@FreeBSD.org>2004-02-28 20:56:35 +0000
commit1ea4f5b08eb4973891b58c77d4bc90181d5e22bd (patch)
treef501264822e55dec659458e1357da5e001910c38 /sys/conf
parent993f5fc4042e0eeb6a00cb4aba3fe131dd8e9872 (diff)
downloadFreeBSD-src-1ea4f5b08eb4973891b58c77d4bc90181d5e22bd.zip
FreeBSD-src-1ea4f5b08eb4973891b58c77d4bc90181d5e22bd.tar.gz
Rename the WATCHDOG option to SW_WATCHDOG and make it use the
generic watchdoc(9) interface. Make watchdogd(8) perform as watchdog(8) as well, and make it possible to specify a check command to run, timeout and sleep periods. Update watchdog(4) to talk about the generic interface and add new watchdog(8) page.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES6
-rw-r--r--sys/conf/options2
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e7851ff..e2429ab 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2089,11 +2089,9 @@ options BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
options HW_WDOG
#
-# Add software watchdog routines. This will add some sysctl OIDs that
-# can be used in combination with an external daemon to create a
-# software-based watchdog solution.
+# Add software watchdog routines.
#
-options WATCHDOG
+options SW_WATCHDOG
#
# Disable swapping of upages and stack pages. This option removes all
diff --git a/sys/conf/options b/sys/conf/options
index e516767..ee6b4d0 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -153,9 +153,9 @@ SHMSEG opt_sysvipc.h
SYSVMSG opt_sysvipc.h
SYSVSEM opt_sysvipc.h
SYSVSHM opt_sysvipc.h
+SW_WATCHDOG opt_watchdog.h
TTYHOG opt_tty.h
VFS_AIO
-WATCHDOG opt_watchdog.h
WLCACHE opt_wavelan.h
WLDEBUG opt_wavelan.h
OpenPOWER on IntegriCloud