diff options
| author | Marco S Hyman <marc@cvs.openbsd.org> | 1998-08-25 18:19:42 +0000 |
|---|---|---|
| committer | Marco S Hyman <marc@cvs.openbsd.org> | 1998-08-25 18:19:42 +0000 |
| commit | 92bcca2ff7502980cfad677921b11e4b418988f0 (patch) | |
| tree | ca1861891877a488268b084ac6b017c8eeab374e | |
| parent | 9357c27d28f901ac690b0395aab584672d40c7d6 (diff) | |
put back recent change (apmd flags) that was accidently removed
| -rw-r--r-- | etc/rc | 10 | ||||
| -rw-r--r-- | etc/rc.conf | 3 |
2 files changed, 11 insertions, 2 deletions
@@ -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/etc/rc.conf b/etc/rc.conf index 71a2d742eeb..9c8be2adc44 100644 --- a/etc/rc.conf +++ b/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 |