From owner-svn-src-head@FreeBSD.ORG Sun Jul 28 06:15:26 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 14C6BE44; Sun, 28 Jul 2013 06:15:26 +0000 (UTC) (envelope-from joel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DB65F2247; Sun, 28 Jul 2013 06:15:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6S6FPN8029577; Sun, 28 Jul 2013 06:15:25 GMT (envelope-from joel@svn.freebsd.org) Received: (from joel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6S6FPHF029576; Sun, 28 Jul 2013 06:15:25 GMT (envelope-from joel@svn.freebsd.org) Message-Id: <201307280615.r6S6FPHF029576@svn.freebsd.org> From: Joel Dahl Date: Sun, 28 Jul 2013 06:15:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253735 - head/usr.sbin/watchdogd X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jul 2013 06:15:26 -0000 Author: joel (doc committer) Date: Sun Jul 28 06:15:25 2013 New Revision: 253735 URL: http://svnweb.freebsd.org/changeset/base/253735 Log: mdoc and language improvements. Modified: head/usr.sbin/watchdogd/watchdogd.8 Modified: head/usr.sbin/watchdogd/watchdogd.8 ============================================================================== --- head/usr.sbin/watchdogd/watchdogd.8 Sun Jul 28 06:02:40 2013 (r253734) +++ head/usr.sbin/watchdogd/watchdogd.8 Sun Jul 28 06:15:25 2013 (r253735) @@ -115,7 +115,7 @@ will terminate. The .Nm utility recognizes the following runtime options: -.Bl -tag -width ".Fl -softtimeout-action Ar action " +.Bl -tag -width 30m .It Fl I Ar file Write the process ID of the .Nm @@ -204,16 +204,23 @@ and the kernel .Xr log 4 device for .Xr syslog 8 . +.Sh FILES +.Bl -tag -width ".Pa /var/run/watchdogd.pid" -compact +.It Pa /var/run/watchdogd.pid +.El .Sh EXAMPLES .Ss Debugging watchdogd and/or your watchdog script. +This is a useful recipe for debugging +.Nm +and your watchdog script. .Pp -This is a useful recipe for debugging watchdogd and your watchdog -script. -.Pp -(Note that ^C works oddly because watchdogd calls system(3) so the +(Note that ^C works oddly because +.Nm +calls +.Xr system 3 +so the first ^C will terminate the "sleep" command.) .Pp -.Pp Explanation of options used: .Bl -enum -offset indent -compact .It @@ -224,17 +231,29 @@ Set the watchdog to trip at 30 seconds. Use of a softtimeout: .Bl -enum -offset indent -compact -nested .It -Use a softtimeout (don't arm the hardware watchdog) (--softtimeout) +Use a softtimeout (do not arm the hardware watchdog). +(--softtimeout) .It -Set the softtimeout action to do both kernel printf(9) and log(9) when it trips. (--softtimeout-action log,printf) +Set the softtimeout action to do both kernel +.Xr printf 9 +and +.Xr log 9 +when it trips. +(--softtimeout-action log,printf) .El .It Use of a pre-timeout: .Bl -enum -offset indent -compact -nested .It -Set a pre-timeout of 15 seconds (this will later trigger a panic/dump) (--pretimeout 15) +Set a pre-timeout of 15 seconds (this will later trigger a panic/dump). +(--pretimeout 15) .It -Set the action to also kernel printf(9) and log(9) when it trips. (--pretimeout-action log,printf) +Set the action to also kernel +.Xr printf 9 +and +.Xr log 9 +when it trips. +(--pretimeout-action log,printf) .El .It Use of a script: @@ -279,10 +298,6 @@ watchdogd -t 120 \\ --pretimeout 60 --pretimeout-action log,printf,panic \\ -e '/path/to/your/script 60' -w -T 15 .Ed -.Sh FILES -.Bl -tag -width ".Pa /var/run/watchdogd.pid" -compact -.It Pa /var/run/watchdogd.pid -.El .Sh SEE ALSO .Xr watchdog 4 , .Xr watchdog 8 ,