From owner-svn-src-head@freebsd.org Thu Jul 14 00:41:39 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 286D3B97174; Thu, 14 Jul 2016 00:41:39 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D66491847; Thu, 14 Jul 2016 00:41:38 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6E0fcMJ033926; Thu, 14 Jul 2016 00:41:38 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6E0fbpC033924; Thu, 14 Jul 2016 00:41:37 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201607140041.u6E0fbpC033924@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 14 Jul 2016 00:41:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302796 - in head: etc/defaults share/man/man5 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2016 00:41:39 -0000 Author: markj Date: Thu Jul 14 00:41:37 2016 New Revision: 302796 URL: https://svnweb.freebsd.org/changeset/base/302796 Log: Remove more references to mroute6d, which was removed in r298512. Modified: head/etc/defaults/rc.conf head/share/man/man5/rc.conf.5 Modified: head/etc/defaults/rc.conf ============================================================================== --- head/etc/defaults/rc.conf Thu Jul 14 00:41:19 2016 (r302795) +++ head/etc/defaults/rc.conf Thu Jul 14 00:41:37 2016 (r302796) @@ -512,12 +512,6 @@ rtadvd_enable="NO" # Set to YES to enab # 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. Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Thu Jul 14 00:41:19 2016 (r302795) +++ head/share/man/man5/rc.conf.5 Thu Jul 14 00:41:37 2016 (r302796) @@ -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 routi .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