diff options
| -rw-r--r-- | etc/Makefile | 8 | ||||
| -rw-r--r-- | etc/rc | 26 | ||||
| -rw-r--r-- | etc/rc.d/aucat | 15 | ||||
| -rw-r--r-- | etc/rc.d/spamd | 16 |
4 files changed, 45 insertions, 20 deletions
diff --git a/etc/Makefile b/etc/Makefile index d587982564c..a39892b6ad4 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.302 2011/07/07 22:30:37 robert Exp $ +# $OpenBSD: Makefile,v 1.303 2011/07/07 23:29:45 robert Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -31,11 +31,11 @@ BIN1+= wsconsctl.conf BIN2= motd # -r-xr-xr-x -RCDAEMONS= apmd bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd ftpd ftpproxy \ - hostapd hotplugd httpd identd ifstated iked inetd isakmpd \ +RCDAEMONS= apmd aucat 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 portmap \ rarpd rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd \ - sendmail sensorsd smtpd snmpd sshd syslogd watchdogd wsmoused \ + sendmail sensorsd smtpd snmpd spamd sshd syslogd watchdogd wsmoused \ xdm ypbind ypldap yppasswdd ypserv MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.364 2011/07/07 23:09:46 guenther Exp $ +# $OpenBSD: rc,v 1.365 2011/07/07 23:29:45 robert Exp $ # System startup script run by init on autoboot # or after single-user. @@ -571,16 +571,14 @@ start_daemon hostapd rwhod lpd ldapd sendmail smtpd httpd ftpd \ [ X"${bt}" != X"NO" -a -f ${bt_rules} ] && \ btctl -f ${bt_rules} -if [ X"${spamd_flags}" != X"NO" ]; then - if [ X"${spamd_black}" != X"NO" ]; then - spamd_flags="${spamd_flags} -b" - fi - echo -n ' spamd'; eval /usr/libexec/spamd ${spamd_flags} +start_daemon spamd + +[ X"${spamd_flags}" != X"NO" ] && \ /usr/libexec/spamd-setup -D - if [ X"${spamd_black}" = X"NO" ]; then - echo -n ' spamlogd' - /usr/libexec/spamlogd ${spamlogd_flags} - fi + +if [ X"${spamd_black}" = X"NO" ]; then + echo -n ' spamlogd' + /usr/libexec/spamlogd ${spamlogd_flags} fi echo '.' @@ -621,13 +619,9 @@ echo '.' date mixerctl_conf -echo -n 'starting console services:' - -if [ X"${aucat_flags}" != X"NO" ]; then - echo -n ' aucat'; aucat -l ${aucat_flags} -fi -start_daemon wsmoused xdm +echo -n 'starting console services:' +start_daemon aucat wsmoused xdm echo '.' exit 0 diff --git a/etc/rc.d/aucat b/etc/rc.d/aucat new file mode 100644 index 00000000000..e4eca01445e --- /dev/null +++ b/etc/rc.d/aucat @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $OpenBSD: aucat,v 1.1 2011/07/07 23:29:45 robert Exp $ + +daemon="/usr/bin/aucat" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_pre() { + daemon_flags="-l ${daemon_flags}" +} + +rc_cmd $1 diff --git a/etc/rc.d/spamd b/etc/rc.d/spamd new file mode 100644 index 00000000000..fbf67898ac4 --- /dev/null +++ b/etc/rc.d/spamd @@ -0,0 +1,16 @@ +#!/bin/sh +# +# $OpenBSD: spamd,v 1.1 2011/07/07 23:29:45 robert Exp $ + +daemon="/usr/libexec/spamd" + +. /etc/rc.d/rc.subr + +pexp="spamd: \[priv\]" + +rc_pre() { + [ X"${spamd_black}" != X"NO" ] && \ + daemon_flags="-b ${daemon_flags}" +} + +rc_cmd $1 |