diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2012-08-20 12:37:54 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2012-08-20 12:37:54 +0000 |
| commit | d90998b9fa55010a81c95dd9a3c70749d83cbc2a (patch) | |
| tree | 0f74f51ae0c227fb390a331637c6a80224af19cf | |
| parent | e7462914be85a35ca1de99177d79e67973dd956c (diff) | |
wire up the bits for tftp-proxy, which is called tftpproxy from rc.d's
point of view.
mostly ok sthen@ ajacoutot@, who were discussing the feng shui of the
start_daemons chunk
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/rc | 5 | ||||
| -rw-r--r-- | etc/rc.conf | 3 | ||||
| -rw-r--r-- | etc/rc.d/tftpproxy | 11 |
4 files changed, 18 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile index 9f75e04d19c..68edc048016 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.319 2012/06/20 18:33:58 matthew Exp $ +# $OpenBSD: Makefile,v 1.320 2012/08/20 12:37:52 dlg Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -55,7 +55,7 @@ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \ 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 sndiod popa3d tftpd + spamlogd sndiod popa3d tftpd tftpproxy MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.400 2012/04/06 15:11:30 jsing Exp $ +# $OpenBSD: rc,v 1.401 2012/08/20 12:37:52 dlg Exp $ # System startup script run by init on autoboot # or after single-user. @@ -493,7 +493,8 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then fi fi -start_daemon hostapd rwhod lpd sendmail smtpd httpd ftpd ftpproxy tftpd +start_daemon hostapd rwhod lpd sendmail smtpd +start_daemon httpd ftpd ftpproxy tftpd tftpproxy start_daemon identd inetd rarpd bootparamd rbootd mopd popa3d start_daemon spamd spamlogd kdc kadmind kpasswdd sndiod echo '.' diff --git a/etc/rc.conf b/etc/rc.conf index deddcaa27a0..fcb203bc329 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.167 2012/04/01 18:32:51 deraadt Exp $ +# $OpenBSD: rc.conf,v 1.168 2012/08/20 12:37:52 dlg Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags ldpd_flags=NO # for normal use: "" @@ -56,6 +56,7 @@ kpasswdd_flags=NO # for normal use: "" btd_flags=NO # for normal use: "" amd_flags=NO # for normal use: "" tftpd_flags=NO # for normal use: "[chroot dir]" +tftpproxy_flags=NO # for normal use: "" # use -u to disable chroot, see httpd(8) httpd_flags=NO # for normal use: "" (or "-DSSL" after reading ssl(8)) diff --git a/etc/rc.d/tftpproxy b/etc/rc.d/tftpproxy new file mode 100644 index 00000000000..ad661474dea --- /dev/null +++ b/etc/rc.d/tftpproxy @@ -0,0 +1,11 @@ +#!/bin/sh +# +# $OpenBSD: tftpproxy,v 1.1 2012/08/20 12:37:53 dlg Exp $ + +daemon="/usr/sbin/tftp-proxy" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_cmd $1 |