From ba3c9fc45cafb5a494c8cd8d9d51d987636be7d7 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Thu, 14 Jul 2016 00:41:37 +0000 Subject: [PATCH] Remove more references to mroute6d, which was removed in r298512. --- etc/defaults/rc.conf | 6 ------ share/man/man5/rc.conf.5 | 31 +------------------------------ 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 32e75f67f43b..0d6e7a69fc4c 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -512,12 +512,6 @@ rtadvd_enable="NO" # Set to YES to enable an IPv6 router # this router becomes a possible candidate # IPv6 default router for local subnets. rtadvd_interfaces="" # Interfaces rtadvd sends RA packets. -mroute6d_enable="NO" # Do IPv6 multicast routing. -mroute6d_program="/usr/local/sbin/pim6dd" # Name of IPv6 multicast - # routing daemon. You need to - # install it from package or - # port. -mroute6d_flags="" # Flags to IPv6 multicast routing daemon. stf_interface_ipv4addr="" # Local IPv4 addr for 6to4 IPv6 over IPv4 # tunneling interface. Specify this entry # to enable 6to4 interface. diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 2ce3a0e55d31..ed04a77b7a04 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 8, 2016 +.Dd July 13, 2016 .Dt RC.CONF 5 .Os .Sh NAME @@ -2818,35 +2818,6 @@ these are the flags to pass to the routing daemon. .Pq Vt str The IPv6 equivalent of .Va routed_flags . -.It Va mroute6d_enable -.Pq Vt bool -If set to -.Dq Li YES , -run the IPv6 multicast routing daemon. -.Pp -Note that multicast routing daemons are no longer included in the -.Fx -base system, however, both -.Xr mrouted 8 -and -.Xr pim6dd 8 -may be installed from the -.Fx -Ports Collection. -.It Va mroute6d_flags -.Pq Vt str -If -.Va mroute6d_enable -is set to -.Dq Li YES , -these are the flags passed to the IPv6 multicast routing daemon. -.It Va mroute6d_program -.Pq Vt str -If -.Va mroute6d_enable -is set to -.Dq Li YES , -this is the path to the IPv6 multicast routing daemon. .It Va rtadvd_enable .Pq Vt bool If set to