summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco S Hyman <marc@cvs.openbsd.org>1998-08-18 23:11:17 +0000
committerMarco S Hyman <marc@cvs.openbsd.org>1998-08-18 23:11:17 +0000
commitc594d973c0f133fcba2d8c1090d38f35ca643ff8 (patch)
tree174b1ec7cfaab6bcede75a4fc1646479fc62c17f
parentf778242c21486210c4818cb4842c31e186d71679 (diff)
start apmd in rc, controlled by rc.conf
-rw-r--r--etc/rc9
-rw-r--r--etc/rc.conf3
2 files changed, 10 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index 1cbe75af5fa..7c14794cd81 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.83 1998/07/24 18:01:25 millert Exp $
+# $OpenBSD: rc,v 1.84 1998/08/18 23:11:15 marc Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -435,7 +435,14 @@ fi
[ -f /etc/rc.local ] && . /etc/rc.local
echo -n standard daemons:
+
+# $apmd is imported from /etc/rc.conf;
+if [ X"${apmd}" == X"YES" -a -x /usr/sbin/apmd ]; then
+ echo -n ' apmd'; /usr/sbin/apmd
+fi
+
echo -n ' cron'; cron
+
echo '.'
date
diff --git a/etc/rc.conf b/etc/rc.conf
index 1696a0bb898..2f25b813a0a 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: rc.conf,v 1.23 1998/06/15 18:41:14 deraadt Exp $
+# $OpenBSD: rc.conf,v 1.24 1998/08/18 23:11:16 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"
@@ -35,6 +35,7 @@ inetd=YES # almost always needed
lpd=NO # printing daemons
check_quotas=YES # NO may be desireable in some YP environments
sshd=YES # run sshd if it exists
+apmd=NO # run apmd if it exists
# miscellaneous other flags
# only used if the appropriate server is marked YES above