diff options
author | netchild <netchild@FreeBSD.org> | 2007-10-15 20:00:24 +0000 |
---|---|---|
committer | netchild <netchild@FreeBSD.org> | 2007-10-15 20:00:24 +0000 |
commit | 21c6e78ea76156c007b7b36f2ef60b4fffd62f50 (patch) | |
tree | f092392b1cc9ab1131c8c9929cf8ba4640ca09b3 /etc | |
parent | 4d72e12bc158aaa04ce18468c3c6286e0928dd0e (diff) | |
download | FreeBSD-src-21c6e78ea76156c007b7b36f2ef60b4fffd62f50.zip FreeBSD-src-21c6e78ea76156c007b7b36f2ef60b4fffd62f50.tar.gz |
Backout sensors framework.
Requested by: phk
Discussed on: cvs-all
Diffstat (limited to 'etc')
-rw-r--r-- | etc/Makefile | 2 | ||||
-rw-r--r-- | etc/defaults/rc.conf | 2 | ||||
-rwxr-xr-x | etc/rc.d/Makefile | 2 | ||||
-rw-r--r-- | etc/rc.d/sensorsd | 17 | ||||
-rw-r--r-- | etc/sensorsd.conf | 50 |
5 files changed, 2 insertions, 71 deletions
diff --git a/etc/Makefile b/etc/Makefile index 725dd24..fb0e3e8 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -17,7 +17,7 @@ BIN1= amd.map apmd.conf auth.conf \ portsnap.conf pf.conf pf.os phones profile protocols \ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ - rc.subr remote rpc sensorsd.conf services shells \ + rc.subr remote rpc services shells \ snmpd.config sysctl.conf syslog.conf \ etc.${MACHINE_ARCH}/ttys \ ${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \ diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index f941870..7a18b9c 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -40,8 +40,6 @@ kldxref_clobber="NO" # Overwrite old linker.hints at boot. kldxref_module_path="" # Override kern.module_path. A ';'-delimited list. powerd_enable="NO" # Run powerd to lower our power usage. powerd_flags="" # Flags to powerd (if enabled). -sensorsd_enable="NO" # Run sensorsd to monitor and log sensor state changes -sensorsd_flags="" # additional flags for sensorsd(8) tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 5f58a6f..56aa598 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -33,7 +33,7 @@ FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \ random rarpd resolv root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ - sensorsd serial sppp statd swap1 \ + serial sppp statd swap1 \ syscons sysctl syslogd \ timed tmp \ ugidfw \ diff --git a/etc/rc.d/sensorsd b/etc/rc.d/sensorsd deleted file mode 100644 index 51bd970..0000000 --- a/etc/rc.d/sensorsd +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: sensorsd -# REQUIRE: syslogd -# - -. /etc/rc.subr - -name="sensorsd" -rcvar=`set_rcvar` -command="/usr/sbin/${name}" - -load_rc_config $name -run_rc_command "$1" diff --git a/etc/sensorsd.conf b/etc/sensorsd.conf deleted file mode 100644 index 3b41b28..0000000 --- a/etc/sensorsd.conf +++ /dev/null @@ -1,50 +0,0 @@ -# $FreeBSD$ -# $OpenBSD: sensorsd.conf,v 1.8 2007/08/14 19:02:02 cnst Exp $ - -# -# Sample sensorsd.conf file. See sensorsd.conf(5) for details. -# - -# +5 voltage (volts) -#hw.sensors.lm0.volt3:low=4.8V:high=5.2V - -# +12 voltage (volts) -#hw.sensors.lm0.volt4:low=11.5V:high=12.5V - -# Chipset temperature (degrees Celsius) -#hw.sensors.lm0.temp0:high=50C - -# CPU temperature (degrees Celsius) -#hw.sensors.lm0.temp1:high=60C - -# CPU fan (RPM) -#hw.sensors.lm0.fan1:low=3000 - -# ignore certain indicators on ipmi(4) -#hw.sensors.ipmi0.indicator1:istatus - -# Warn if any temperature sensor is over 70 degC. -# This entry will match only those temperature sensors -# that don't have their own entry. -#temp:high=70C - - -# By default, sensorsd(8) reports status changes of all sensors that -# keep their state. Uncomment the following lines if you want to -# suppress reports about status changes of specific sensor types. - -#temp:istatus -#fan:istatus -#volt:istatus -#acvolt:istatus -#resistance:istatus -#power:istatus -#current:istatus -#watthour:istatus -#amphour:istatus -#indicator:istatus -#raw:istatus -#percentage:istatus -#illuminance:istatus -#drive:istatus -#timedelta:istatus |