diff options
| -rw-r--r-- | etc/Makefile | 6 | ||||
| -rw-r--r-- | etc/rc | 4 | ||||
| -rw-r--r-- | etc/rc.conf | 7 | ||||
| -rw-r--r-- | etc/rc.d/aucat | 16 | ||||
| -rw-r--r-- | etc/rc.d/sndiod | 9 |
5 files changed, 18 insertions, 24 deletions
diff --git a/etc/Makefile b/etc/Makefile index b034d17f7c5..088a620656f 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.311 2011/10/29 14:29:33 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.312 2011/12/09 14:52:26 ratchov Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -48,14 +48,14 @@ BIN1+= wsconsctl.conf BIN2= motd # -r-xr-xr-x -RCDAEMONS= amd apmd aucat bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd \ +RCDAEMONS= amd apmd bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd \ ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \ inetd isakmpd ldapd ldattach ldpd lpd mopd mrouted named nsd \ ntpd ospfd ospf6d portmap pflogd rarpd rbootd relayd ripd \ route6d rtadvd rtsold rwhod sasyncd sendmail sensorsd smtpd \ snmpd spamd sshd syslogd watchdogd wsmoused xdm ypbind ypldap \ yppasswdd ypserv kdc kadmind kpasswdd nfsd mountd lockd statd \ - spamlogd + spamlogd sndiod MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.396 2011/10/13 07:54:06 ajacoutot Exp $ +# $OpenBSD: rc,v 1.397 2011/12/09 14:52:26 ratchov Exp $ # System startup script run by init on autoboot # or after single-user. @@ -505,7 +505,7 @@ fi start_daemon hostapd rwhod lpd sendmail smtpd httpd ftpd ftpproxy start_daemon identd inetd rarpd bootparamd rbootd mopd popa3d -start_daemon spamd spamlogd kdc kadmind kpasswdd aucat +start_daemon spamd spamlogd kdc kadmind kpasswdd sndiod echo '.' if [ X"${spamd_flags}" != X"NO" ]; then 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-}} diff --git a/etc/rc.d/aucat b/etc/rc.d/aucat deleted file mode 100644 index 36538155553..00000000000 --- a/etc/rc.d/aucat +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: aucat,v 1.2 2011/07/08 05:16:08 ajacoutot Exp $ - -daemon="/usr/bin/aucat" - -. /etc/rc.d/rc.subr - -pexp="${daemon} -l${daemon_flags:+ ${daemon_flags}}" -rc_reload=NO - -rc_pre() { - daemon_flags="-l ${daemon_flags}" -} - -rc_cmd $1 diff --git a/etc/rc.d/sndiod b/etc/rc.d/sndiod new file mode 100644 index 00000000000..7a75310f582 --- /dev/null +++ b/etc/rc.d/sndiod @@ -0,0 +1,9 @@ +#!/bin/sh +# +# $OpenBSD: sndiod,v 1.1 2011/12/09 14:52:27 ratchov Exp $ + +daemon="/usr/bin/sndiod" + +. /etc/rc.d/rc.subr + +rc_cmd $1 |