From e72e8e7a98f90da43a57aad68cc059a6dae2f8af Mon Sep 17 00:00:00 2001
From: matthieu <>
Date: Sat, 6 Jan 2007 12:00:06 +0000
Subject: [PATCH] remove acpid references. ok gwk@, steven@, grange@ and
 janus@.

---
 src/etc/rc      | 6 +-----
 src/etc/rc.conf | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/etc/rc b/src/etc/rc
index c607adc0..1e2b14f6 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -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/src/etc/rc.conf b/src/etc/rc.conf
index 50573f80..ef6f7156 100644
--- a/src/etc/rc.conf
+++ b/src/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