Browse Source

fix boot output and make sure spamlogd is only started when needed

OPENBSD_5_0
robert 13 years ago
parent
commit
1593f7f2a8
2 changed files with 11 additions and 4 deletions
  1. +4
    -3
      src/etc/rc
  2. +7
    -1
      src/etc/rc.conf

+ 4
- 3
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.377 2011/07/08 02:15:34 robert Exp $
# $OpenBSD: rc,v 1.378 2011/07/08 04:54:12 robert Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -414,9 +414,8 @@ dmesg >/var/run/dmesg.boot
make_keys make_keys
echo -n 'starting system logger: '
echo -n 'starting system logger:'
start_daemon syslogd start_daemon syslogd
echo '.'
if [ X"${pf}" != X"NO" ]; then if [ X"${pf}" != X"NO" ]; then
ifconfig pflog0 create >/dev/null 2>&1 ifconfig pflog0 create >/dev/null 2>&1
@ -426,6 +425,8 @@ if [ X"${pf}" != X"NO" ]; then
fi fi
fi fi
echo '.'
echo -n 'starting name service daemons:' echo -n 'starting name service daemons:'
start_daemon named nsd start_daemon named nsd
echo '.' echo '.'


+ 7
- 1
src/etc/rc.conf View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: rc.conf,v 1.150 2011/07/08 02:15:34 robert Exp $
# $OpenBSD: rc.conf,v 1.151 2011/07/08 04:54:12 robert Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags # set these to "NO" to turn them off. otherwise, they're used as flags
ldpd_flags=NO # for normal use: "" ldpd_flags=NO # for normal use: ""
@ -122,6 +122,12 @@ unset statd_flags
[ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
# special care needed for spamlogd to avoid starting it up and failing
# all the time
if [ X"${spamd_flags}" = X"NO" -o X"${spamd_black}" != X"NO" ]; then
spamlogd_flags=NO
fi
# backward compatibility # backward compatibility
: ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)} : ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)}
: ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)} : ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)}


Loading…
Cancel
Save