public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/netifrc:master commit in: /
Date: Sat, 24 Aug 2013 01:19:47 +0000 (UTC)	[thread overview]
Message-ID: <1377307138.6486f5a2fd87047fd4309ea91af583a26c7c6e0f.robbat2@OpenRC> (raw)

commit:     6486f5a2fd87047fd4309ea91af583a26c7c6e0f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 24 01:18:58 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> 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"


             reply	other threads:[~2013-08-24  1:19 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-24  1:19 Robin H. Johnson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-29  0:28 [gentoo-commits] proj/netifrc:master commit in: / Sam James
2024-09-23 12:02 Sam James
2024-09-23 11:58 Sam James
2023-10-20  0:20 Sam James
2023-09-10 15:18 Sam James
2023-05-29  0:17 Mike Gilbert
2023-04-17  4:37 Sam James
2021-04-05 20:02 Robin H. Johnson
2021-04-05 20:00 Robin H. Johnson
2021-02-10 13:08 Lars Wendler
2021-01-05 18:19 Robin H. Johnson
2020-01-04  8:09 Robin H. Johnson
2019-04-21  4:18 Robin H. Johnson
2019-04-21  4:17 Robin H. Johnson
2019-04-21  4:12 Robin H. Johnson
2018-07-10 21:42 Jason Donenfeld
2017-11-27 20:27 Robin H. Johnson
2017-10-21 20:56 Robin H. Johnson
2017-06-14 20:24 Robin H. Johnson
2017-06-09 23:55 Robin H. Johnson
2017-01-27 21:54 Robin H. Johnson
2016-10-27  1:23 Robin H. Johnson
2016-10-24 23:16 Robin H. Johnson
2016-10-24 23:16 Robin H. Johnson
2016-10-24 20:51 Robin H. Johnson
2016-07-19 19:59 Robin H. Johnson
2016-07-05 18:23 Robin H. Johnson
2016-07-05 18:14 Robin H. Johnson
2016-07-05 18:13 Robin H. Johnson
2015-11-08 14:33 Robin H. Johnson
2015-11-08 14:33 Robin H. Johnson
2015-11-08 14:30 Robin H. Johnson
2015-11-08 14:30 Robin H. Johnson
2015-05-25 10:04 Mike Frysinger
2015-05-25 10:04 Mike Frysinger
2015-05-25 10:04 Mike Frysinger
2015-05-25 10:01 Mike Frysinger
2015-01-22 23:10 Robin H. Johnson
2015-01-22 23:01 Robin H. Johnson
2015-01-22 23:01 Robin H. Johnson
2015-01-22 23:01 Robin H. Johnson
2015-01-16 18:16 Robin H. Johnson
2015-01-09 17:19 Robin H. Johnson
2015-01-09 17:17 Robin H. Johnson
2014-12-11 18:13 Robin H. Johnson
2014-07-17 17:56 Robin H. Johnson
2014-04-15 18:20 Robin H. Johnson
2014-03-07 17:37 Robin H. Johnson
2014-03-05 18:40 Robin H. Johnson
2014-03-04 18:45 Robin H. Johnson
2013-08-28 17:01 Robin H. Johnson
2013-08-25  8:17 Robin H. Johnson
2013-08-24  1:19 Robin H. Johnson
2013-08-24  1:19 Robin H. Johnson
2013-08-24  1:04 Robin H. Johnson
2013-08-24  1:04 Robin H. Johnson
2013-08-24  1:04 Robin H. Johnson
2013-08-24  1:04 Robin H. Johnson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377307138.6486f5a2fd87047fd4309ea91af583a26c7c6e0f.robbat2@OpenRC \
    --to=robbat2@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox