From owner-svn-ports-all@freebsd.org  Mon Oct  9 17:20:01 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 E7395E37088;
 Mon,  9 Oct 2017 17:20:01 +0000 (UTC) (envelope-from ume@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 4570372C7F;
 Mon,  9 Oct 2017 17:20:01 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v99HK0Yo084743;
 Mon, 9 Oct 2017 17:20:00 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v99HK0D5084742;
 Mon, 9 Oct 2017 17:20:00 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201710091720.v99HK0D5084742@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Mon, 9 Oct 2017 17:20:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451625 - head/net/u6rd/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: ume
X-SVN-Commit-Paths: head/net/u6rd/files
X-SVN-Commit-Revision: 451625
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Oct 2017 17:20:02 -0000

Author: ume
Date: Mon Oct  9 17:20:00 2017
New Revision: 451625
URL: https://svnweb.freebsd.org/changeset/ports/451625

Log:
  improve fib handling.

Modified:
  head/net/u6rd/files/u6rd.in

Modified: head/net/u6rd/files/u6rd.in
==============================================================================
--- head/net/u6rd/files/u6rd.in	Mon Oct  9 17:03:00 2017	(r451624)
+++ head/net/u6rd/files/u6rd.in	Mon Oct  9 17:20:00 2017	(r451625)
@@ -52,7 +52,7 @@ plen_equal()
 
 start_precmd()
 {
-	ifconfig ${u6rd_interface} create ${iface_fib}
+	ifconfig ${u6rd_interface} create
 	ifconfig ${u6rd_interface} inet6 -ifdisabled >/dev/null 2>&1
 	if [ -n "${u6rd_interface_flags}" ]; then
 		ifconfig ${u6rd_interface} ${u6rd_interface_flags}
@@ -60,6 +60,9 @@ start_precmd()
 	if [ -n "${u6rd_my_v6_addr}" ]; then
 		ifconfig ${u6rd_interface} inet6 ${u6rd_my_v6_addr}
 	fi
+	if [ -n "${u6rd_fib}" ]; then
+		ifconfig ${u6rd_interface} fib ${u6rd_fib}
+	fi
 	ifconfig ${u6rd_interface} up
 	if ! plen_equal ${u6rd_prefix} ${u6rd_my_v6_addr}; then
 		route delete -inet6 ${u6rd_prefix} ${route_fib} >/dev/null 2>&1
@@ -85,8 +88,6 @@ stop_postcmd()
 load_rc_config ${name}
 command_args="-u ${u6rd_username} ${u6rd_interface} ${u6rd_prefix} ${u6rd_relay_v4_addr} ${u6rd_my_v4_addr}"
 if [ -n "${u6rd_fib}" ]; then
-	iface_fib="fib ${u6rd_fib}"
 	route_fib="-fib ${u6rd_fib}"
-	u6rd_fib=
 fi
 run_rc_command "$1"