From 8c654407ec02ee9e9fd7a178300d33af106619a9 Mon Sep 17 00:00:00 2001
From: marc <>
Date: Tue, 25 Aug 1998 18:19:41 +0000
Subject: [PATCH] put back recent change (apmd flags) that was accidently
 removed

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

diff --git a/src/etc/rc b/src/etc/rc
index ef9c36fe..60d7f052 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.86 1998/08/19 04:25:46 form Exp $
+#	$OpenBSD: rc,v 1.87 1998/08/25 18:19:40 marc Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -445,7 +445,15 @@ fi
 [ -f /etc/rc.local ] && . /etc/rc.local
 
 echo -n standard daemons:
+
+# $apmd_flags is imported from /etc/rc.conf;
+# don't run daemon if $apmd_flags == NO or /usr/sbin/apmd doesn't exist
+if [ "X${apmd_flags}" != X"NO" -a -x /usr/sbin/apmd ]; then
+        echo -n ' apmd';        /usr/sbin/apmd ${apmd_flags}
+fi
+
 echo -n ' cron';		cron
+
 echo '.'
 
 date
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 71a2d742..9c8be2ad 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.26 1998/08/19 04:25:49 form Exp $
+#	$OpenBSD: rc.conf,v 1.27 1998/08/25 18:19:41 marc Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for 'normal' use: routed_flags="-q"
@@ -15,6 +15,7 @@ timed_flags=NO		# for 'normal' use: timed_flags=""
 photurisd_flags=NO	# for 'normal' use: photurisd_flags=""
 mopd_flags=NO		# for 'normal' use: mopd_flags="-a"
 httpd_flags=NO		# for 'normal' use: httpd_flags=""
+apmd_flags=NO		# for 'normal' use: apmd_flags=""
 dhcpd_flags=NO		# for 'normal' use: dhcpd_flags="-q"
 
 # On some architectures, you must also disable console getty in /etc/ttys