diff options
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/rc | 9 | ||||
| -rw-r--r-- | etc/rc.conf | 4 | ||||
| -rw-r--r-- | etc/rc.d/ipropd_master | 11 | ||||
| -rw-r--r-- | etc/rc.d/ipropd_slave | 11 |
5 files changed, 32 insertions, 7 deletions
diff --git a/etc/Makefile b/etc/Makefile index d2060550b22..844c0a17e1b 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.333 2013/07/10 05:12:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.334 2013/08/09 16:24:54 ajacoutot Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -56,7 +56,7 @@ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \ sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \ wsmoused xdm ypbind ypldap yppasswdd ypserv kdc kadmind \ kpasswdd nfsd mountd lockd statd spamlogd sndiod popa3d \ - tftpd tftpproxy ldomd + tftpd tftpproxy ldomd ipropd_master ipropd_slave MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.406 2013/06/01 14:06:20 naddy Exp $ +# $OpenBSD: rc,v 1.407 2013/08/09 16:24:54 ajacoutot Exp $ # System startup script run by init on autoboot # or after single-user. @@ -493,9 +493,10 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then fi fi -start_daemon hostapd rwhod lpd sendmail smtpd httpd slowcgi nginx ftpd ftpproxy -start_daemon tftpd tftpproxy identd inetd rarpd bootparamd rbootd mopd -start_daemon popa3d spamd spamlogd kdc kadmind kpasswdd sndiod +start_daemon hostapd rwhod lpd sendmail smtpd httpd slowcgi nginx ftpd +start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd +start_daemon rbootd mopd popa3d spamd spamlogd kdc kadmind kpasswdd +start_daemon ipropd_master ipropd_slave sndiod echo '.' if [ X"${spamd_flags}" != X"NO" ]; then diff --git a/etc/rc.conf b/etc/rc.conf index c7668220eda..dca9434c776 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.180 2013/08/09 16:00:53 ajacoutot Exp $ +# $OpenBSD: rc.conf,v 1.181 2013/08/09 16:24:54 ajacoutot Exp $ # DO NOT EDIT THIS FILE!! # @@ -64,6 +64,8 @@ portmap_flags=NO # for normal use: "" kdc_flags=NO # for normal use: "" see 'info heimdal' for help kadmind_flags=NO # for normal use: "" kpasswdd_flags=NO # for normal use: "" +ipropd_master_flags=NO # for normal use: "" +ipropd_slave_flags=NO # for normal use: "[master hostname]" amd_flags=NO # for normal use: "" tftpd_flags=NO # for normal use: "[chroot dir]" tftpproxy_flags=NO # for normal use: "" diff --git a/etc/rc.d/ipropd_master b/etc/rc.d/ipropd_master new file mode 100644 index 00000000000..bc820f24314 --- /dev/null +++ b/etc/rc.d/ipropd_master @@ -0,0 +1,11 @@ +#!/bin/sh +# +# $OpenBSD: ipropd_master,v 1.1 2013/08/09 16:24:54 ajacoutot Exp $ + +daemon="/usr/libexec/ipropd-master --detach" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_cmd $1 diff --git a/etc/rc.d/ipropd_slave b/etc/rc.d/ipropd_slave new file mode 100644 index 00000000000..e58988d4205 --- /dev/null +++ b/etc/rc.d/ipropd_slave @@ -0,0 +1,11 @@ +#!/bin/sh +# +# $OpenBSD: ipropd_slave,v 1.1 2013/08/09 16:24:54 ajacoutot Exp $ + +daemon="/usr/libexec/ipropd-slave --detach" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_cmd $1 |