diff options
author | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2011-12-09 14:52:28 +0000 |
---|---|---|
committer | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2011-12-09 14:52:28 +0000 |
commit | 0bb1d613e97facf8258aaa07410c7ae8f6ebde7e (patch) | |
tree | d61c263588581ed6a477038ce6ab59ce04dc9d02 /etc/rc.conf | |
parent | 34ca1a2c6b666fc98daf82367ae5c1bdfe2c0921 (diff) |
Handle aucat -> sndiod name change, and enable sndiod by default. Mostly
from ajacoutot@.
ok deraadt ajacoutot
Diffstat (limited to 'etc/rc.conf')
-rw-r--r-- | etc/rc.conf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc.conf b/etc/rc.conf index 1f3b7d51413..c67ed58b5d6 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.163 2011/10/07 05:54:48 ajacoutot Exp $ +# $OpenBSD: rc.conf,v 1.164 2011/12/09 14:52:26 ratchov Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags ldpd_flags=NO # for normal use: "" @@ -44,7 +44,7 @@ ifstated_flags=NO # for normal use: "" relayd_flags=NO # for normal use: "" snmpd_flags=NO # for normal use: "" smtpd_flags=NO # for normal use: "" -aucat_flags=NO # for normal use: "" +sndiod_flags="" # for normal use: "" ldapd_flags=NO # for normal use: "" inetd_flags="" # for normal use: "" rwhod_flags=NO # for normal use: "" @@ -122,7 +122,7 @@ local_rcconf="/etc/rc.conf.local" unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags unset kpasswdd_flags btd_flags nfsd_flags mountd_flags lockd_flags -unset statd_flags amd_flags ypbind_flags +unset statd_flags amd_flags ypbind_flags sndiod_flags [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line @@ -152,3 +152,4 @@ fi : ${statd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)} : ${amd_flags=$([ X"${amd-NO}" = XYES ] || echo NO)} : ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)} +: ${sndiod_flags=${aucat_flags-}} |