diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-01-06 12:00:07 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-01-06 12:00:07 +0000 |
| commit | a8c88a587872b293df4f746f0db121c836000f35 (patch) | |
| tree | 44e44b13c5f490b78b5080144a4ef602810118cf | |
| parent | 10e5231c4b8e4c579fb2a4faeb03373cd30c37c5 (diff) | |
remove acpid references. ok gwk@, steven@, grange@ and janus@.
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.conf | 3 |
2 files changed, 2 insertions, 7 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.295 2006/11/28 23:44:35 mcbride Exp $ +# $OpenBSD: rc,v 1.296 2007/01/06 12:00:06 matthieu Exp $ # System startup script run by init on autoboot # or after single-user. @@ -715,10 +715,6 @@ if [ X"${apmd_flags}" != X"NO" -a -x /usr/sbin/apmd ]; then echo -n ' apmd'; /usr/sbin/apmd ${apmd_flags} fi -if [ X"${acpid_flags}" != X"NO" -a -x /usr/sbin/acpid ]; then - echo -n ' acpid'; /usr/sbin/acpid ${acpid_flags} -fi - if [ X"${sensorsd_flags}" != X"NO" ]; then echo -n ' sensorsd'; /usr/sbin/sensorsd ${sensorsd_flags} fi diff --git a/etc/rc.conf b/etc/rc.conf index 50573f80561..ef6f715641f 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.118 2006/10/29 18:58:57 norby Exp $ +# $OpenBSD: rc.conf,v 1.119 2007/01/06 12:00:06 matthieu Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" @@ -22,7 +22,6 @@ isakmpd_flags=NO # for normal use: "" sasyncd_flags=NO # for normal use: "" mopd_flags=NO # for normal use: "-a" apmd_flags=NO # for normal use: "" -acpid_flags=NO # for normal use: "" dhcpd_flags=NO # for normal use: "" dhcrelay_flags=NO # for normal use: "-i interface [server]" rtadvd_flags=NO # for normal use: list of interfaces |