From owner-p4-projects@FreeBSD.ORG Sat Aug 18 16:42:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77C1D16A468; Sat, 18 Aug 2007 16:42:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3711A16A419 for ; Sat, 18 Aug 2007 16:42:51 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 24EC913C428 for ; Sat, 18 Aug 2007 16:42:51 +0000 (UTC) (envelope-from cnst@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7IGgp6Q047961 for ; Sat, 18 Aug 2007 16:42:51 GMT (envelope-from cnst@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7IGgoTL047958 for perforce@freebsd.org; Sat, 18 Aug 2007 16:42:50 GMT (envelope-from cnst@FreeBSD.org) Date: Sat, 18 Aug 2007 16:42:50 GMT Message-Id: <200708181642.l7IGgoTL047958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cnst@FreeBSD.org using -f From: "Constantine A. Murenin" To: Perforce Change Reviews Cc: Subject: PERFORCE change 125307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2007 16:42:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=125307 Change 125307 by cnst@dale on 2007/08/18 16:42:26 sync sensorsd with upstream Obtained from: OpenBSD -D2007-08-01 Affected files ... .. //depot/projects/soc2007/cnst-sensors/usr.sbin.sensorsd/sensorsd.8#3 edit .. //depot/projects/soc2007/cnst-sensors/usr.sbin.sensorsd/sensorsd.conf.5#3 edit Differences ... ==== //depot/projects/soc2007/cnst-sensors/usr.sbin.sensorsd/sensorsd.8#3 (text+ko) ==== @@ -1,6 +1,6 @@ -.\" $P4: //depot/projects/soc2007/cnst-sensors/usr.sbin.sensorsd/sensorsd.8#2 $ +.\" $P4: //depot/projects/soc2007/cnst-sensors/usr.sbin.sensorsd/sensorsd.8#3 $ .\" $FreeBSD$ -.\" $OpenBSD: sensorsd.8,v 1.11 2007/05/31 19:20:29 jmc Exp $ +.\" $OpenBSD: sensorsd.8,v 1.13 2007/07/31 08:11:36 jmc Exp $ .\" .\" Copyright (c) 2003 Henning Brauer .\" Copyright (c) 2005 Matthew Gream @@ -17,7 +17,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate$ +.Dd $Mdocdate: July 31 2007 $ .Dt SENSORSD 8 .Os .Sh NAME @@ -25,6 +25,7 @@ .Nd monitor hardware sensors .Sh SYNOPSIS .Nm sensorsd +.Op Fl d .Sh DESCRIPTION The .Nm @@ -46,6 +47,15 @@ configuration file. This file is reloaded upon receiving .Dv SIGHUP . +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl d +Do not daemonize. +If this option is specified, +.Nm +will run in the foreground. +.El .Sh FILES .Bl -tag -width "/etc/sensorsd.conf" .It /etc/sensorsd.conf ==== //depot/projects/soc2007/cnst-sensors/usr.sbin.sensorsd/sensorsd.conf.5#3 (text+ko) ==== @@ -1,6 +1,6 @@ -.\" $P4: //depot/projects/soc2007/cnst-sensors/usr.sbin.sensorsd/sensorsd.conf.5#2 $ +.\" $P4: //depot/projects/soc2007/cnst-sensors/usr.sbin.sensorsd/sensorsd.conf.5#3 $ .\" $FreeBSD$ -.\" $OpenBSD: sensorsd.conf.5,v 1.14 2007/05/31 19:20:29 jmc Exp $ +.\" $OpenBSD: sensorsd.conf.5,v 1.15 2007/06/05 04:10:56 jmc Exp $ .\" .\" Copyright (c) 2003 Henning Brauer .\" Copyright (c) 2005 Matthew Gream @@ -35,8 +35,8 @@ is matched by at most one entry in .Nm , which may specify high and low limits, -and whether sensor status changes provided by driver should be ignored. -If the limits are crossed or if status provided by the driver changes, +and whether sensor status changes provided by the driver should be ignored. +If the limits are crossed or if the status provided by the driver changes, .Xr sensorsd 8 's alert functionality is triggered and a command, if specified, is executed. @@ -44,17 +44,17 @@ .Nm follows the syntax of configuration databases as documented in .Xr getcap 3 . -Complete +Sensors may be specified by their full .Va hw.sensors .Xr sysctl 8 -variable names are used to find entries, -with a fallback to sensor types. -For example, if an entry with a full name of a certain temperature -sensor is not present in -.Nm , -then an entry -.Va temp -will be looked at to determine the settings. +variable name or by type, +with the full name taking precedence. +For example, if an entry +.Dq hw.sensors.lm0.temp1 +is not found, then an entry for +.Dq temp +will instead be looked for. +.Pp The following attributes may be used: .Pp .Bl -tag -width "commandXX" -offset indent -compact @@ -65,7 +65,7 @@ .It Li low Specify a lower limit. .It Li istatus -Specify to ignore status provided by the driver. +Ignore status provided by the driver. .El .Pp The values for temperature sensors can be given in degrees Celsius or @@ -103,9 +103,9 @@ monitors status changes on all sensors that keep their state. This behaviour may be altered by using the .Dq istatus -attribute, -for example, you may specify to ignore status changes of sensors with -certain type, or of any individual sensors. +attribute to ignore +status changes of sensors of a certain type +or individual sensors. .Sh FILES .Bl -tag -width "/etc/sensorsd.conf" .It /etc/sensorsd.conf @@ -130,7 +130,7 @@ will be executed, with the sensor number passed to it; however, no alerts will be generated for status changes on timedelta sensors. For all other sensors whose drivers automatically provide -sensor status updates, alerts will be generated +sensor status updates, alerts will be generated each time those sensors undergo status transitions. .Bd -literal -offset indent # Comments are allowed