From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 576801381F3 for ; Sat, 24 Aug 2013 01:19:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF32EE0D55; Sat, 24 Aug 2013 01:19:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CFFFE0D55 for ; Sat, 24 Aug 2013 01:19:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3417E33ECB7 for ; Sat, 24 Aug 2013 01:19:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E3915E5462 for ; Sat, 24 Aug 2013 01:19:47 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1377307138.6486f5a2fd87047fd4309ea91af583a26c7c6e0f.robbat2@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: / X-VCS-Repository: proj/netifrc X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 6486f5a2fd87047fd4309ea91af583a26c7c6e0f X-VCS-Branch: master Date: Sat, 24 Aug 2013 01:19:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1a6803f6-25d4-416b-9f63-68d73a694695 X-Archives-Hash: 0b85ebf9102f7b6fc0482946c740f4c2 commit: 6486f5a2fd87047fd4309ea91af583a26c7c6e0f Author: Robin H. Johnson gentoo org> AuthorDate: Sat Aug 24 01:18:58 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Aug 24 01:18:58 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=6486f5a2 Merge remote-tracking branch 'origin/bug481970' doc/net.example.BSD.in | 9 +++++++++ doc/net.example.Linux.in | 9 +++++++++ net/iproute2.sh | 6 +++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --cc net/iproute2.sh index 7aeeb99,d8e8b8b..58b7bc4 --- a/net/iproute2.sh +++ b/net/iproute2.sh @@@ -332,12 -292,39 +330,14 @@@ _iproute2_ipv6_tentative( iproute2_post_start() { - local n=5 + local n= + eval n=\$dad_timeout_${IFVAR} + [ -z "$n" ] && n=${dad_timeout:-5} - # Kernel may not have IP built in - if [ -e /proc/net/route ]; then - local rules="$(_get_array "rules_${IFVAR}")" - if [ -n "${rules}" ]; then - if ! ip -4 rule list | grep -q "^"; then - eerror "IP Policy Routing (CONFIG_IP_MULTIPLE_TABLES) needed for ip rule" - else - service_set_value "ip_rule" "${rules}" - einfo "Adding IPv4 RPDB rules" - _ip_rule_runner -4 add "${rules}" - fi - fi - ip -4 route flush table cache dev "${IFACE}" - fi - - # Kernel may not have IPv6 built in - if [ -e /proc/net/ipv6_route ]; then - local rules="$(_get_array "rules6_${IFVAR}")" - if [ -n "${rules}" ]; then - if ! ip -6 rule list | grep -q "^"; then - eerror "IPv6 Policy Routing (CONFIG_IPV6_MULTIPLE_TABLES) needed for ip rule" - else - service_set_value "ip6_rule" "${rules}" - einfo "Adding IPv6 RPDB rules" - _ip_rule_runner -6 add "${rules}" - fi - fi - ip -6 route flush table cache dev "${IFACE}" - fi + local policyroute_order= + eval policyroute_order=\$policy_rules_before_routes_${IFVAR} + [ -z "$policyroute_order" ] && policyroute_order=${policy_rules_before_routes:-no} + yesno "$policyroute_order" || _iproute2_policy_routing if _iproute2_ipv6_tentative; then ebegin "Waiting for IPv6 addresses"