diff options
| author | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2017-03-17 17:57:41 +0000 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2017-03-17 17:57:41 +0000 |
| commit | 8de6365cceea8dd679135a89594ad4f11db6be46 (patch) | |
| tree | d26aba9ff42eb56b15cbb514132bd05ca3126a28 | |
| parent | 7f46cd5bebabf23521cb23807020f616b5ef7818 (diff) | |
Enable dhcrelay6(8).
ok deraadt@
| -rw-r--r-- | distrib/sets/lists/base/mi | 2 | ||||
| -rw-r--r-- | distrib/sets/lists/man/mi | 1 | ||||
| -rw-r--r-- | etc/Makefile | 6 | ||||
| -rw-r--r-- | etc/rc.d/dhcrelay6 | 11 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 4 |
5 files changed, 19 insertions, 5 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index bd4cc3292b2..64c25b5e20c 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -143,6 +143,7 @@ ./etc/rc.d/cron ./etc/rc.d/dhcpd ./etc/rc.d/dhcrelay +./etc/rc.d/dhcrelay6 ./etc/rc.d/dvmrpd ./etc/rc.d/eigrpd ./etc/rc.d/ftpd @@ -2359,6 +2360,7 @@ ./usr/sbin/dev_mkdb ./usr/sbin/dhcpd ./usr/sbin/dhcrelay +./usr/sbin/dhcrelay6 ./usr/sbin/dig ./usr/sbin/dvmrpctl ./usr/sbin/dvmrpd diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 4dcd1d30b2e..c6c1caadb32 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -2101,6 +2101,7 @@ ./usr/share/man/man8/dhclient.8 ./usr/share/man/man8/dhcpd.8 ./usr/share/man/man8/dhcrelay.8 +./usr/share/man/man8/dhcrelay6.8 ./usr/share/man/man8/disklabel.8 ./usr/share/man/man8/diskless.8 ./usr/share/man/man8/dmesg.8 diff --git a/etc/Makefile b/etc/Makefile index ad3b7caae8b..bfd491b9bab 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.452 2017/02/27 21:53:11 rpe Exp $ +# $OpenBSD: Makefile,v 1.453 2017/03/17 17:57:40 rzalamena Exp $ .include <bsd.own.mk> @@ -50,8 +50,8 @@ EXAMPLES_600=bgpd.conf doas.conf dvmrpd.conf eigrpd.conf hostapd.conf \ ripd.conf sasyncd.conf snmpd.conf vm.conf ypldap.conf # -r-xr-xr-x -RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \ - ftpproxy ftpproxy6 hostapd hotplugd httpd identd ifstated \ +RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dhcrelay6 dvmrpd \ + eigrpd ftpd ftpproxy ftpproxy6 hostapd hotplugd httpd identd ifstated \ iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \ lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \ pflogd portmap radiusd rarpd rbootd rebound relayd ripd route6d \ diff --git a/etc/rc.d/dhcrelay6 b/etc/rc.d/dhcrelay6 new file mode 100644 index 00000000000..36781558716 --- /dev/null +++ b/etc/rc.d/dhcrelay6 @@ -0,0 +1,11 @@ +#!/bin/sh +# +# $OpenBSD: dhcrelay6,v 1.1 2017/03/17 17:57:40 rzalamena Exp $ + +daemon="/usr/sbin/dhcrelay6" + +. /etc/rc.d/rc.subr + +rc_reload=NO + +rc_cmd $1 diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 49685729d4e..6353403c735 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.198 2017/01/24 12:14:44 beck Exp $ +# $OpenBSD: Makefile,v 1.199 2017/03/17 17:57:40 rzalamena Exp $ .include <bsd.own.mk> SUBDIR= ac accton acme-client acpidump adduser amd apm apmd arp \ authpf bgpctl bgpd bind chroot config cron crunchgen dev_mkdb \ - dhcpd dhcrelay dvmrpctl dvmrpd edquota eeprom eigrpd eigrpctl \ + dhcpd dhcrelay dhcrelay6 dvmrpctl dvmrpd edquota eeprom eigrpd eigrpctl \ fdformat ftp-proxy gpioctl hostapd hostctl hotplugd httpd identd \ ifstated ikectl inetd installboot iostat iscsictl iscsid kgmon \ kvm_mkdb ldapd ldapctl ldomctl ldomd ldpd ldpctl lpr makefs \ |