| 1 |
commit: 20480048cae39d6c3c8bb4fdb7bfc5cc842c61ca |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 21 09:53:51 2011 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 09:55:47 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=20480048 |
| 7 |
|
| 8 |
net/iproute2: Pass required explicit -6 for IPv6 tunnels (#347657) |
| 9 |
|
| 10 |
Tunnel modes ipip6 and ip6ip6 require an explicit family selection for |
| 11 |
the ip tunnel call. |
| 12 |
|
| 13 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 14 |
X-Gentoo-Bug: 347657 |
| 15 |
|
| 16 |
--- |
| 17 |
net/iproute2.sh | 7 ++++++- |
| 18 |
1 files changed, 6 insertions(+), 1 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net/iproute2.sh b/net/iproute2.sh |
| 21 |
index 6194faf..a2e9db7 100644 |
| 22 |
--- a/net/iproute2.sh |
| 23 |
+++ b/net/iproute2.sh |
| 24 |
@@ -239,9 +239,14 @@ iproute2_pre_start() |
| 25 |
if [ -n "${tunnel}" ]; then |
| 26 |
# Set our base metric to 1000 |
| 27 |
metric=1000 |
| 28 |
+ # Bug#347657: If the mode is 'ipip6' or 'ip6ip6', the -6 must be passed |
| 29 |
+ # to iproute2 during tunnel creation. |
| 30 |
+ local ipproto='' |
| 31 |
+ [ "${tunnel##mode ipip6}" != "${tunnel}" ] && ipproto='-6' |
| 32 |
+ [ "${tunnel##mode ip6ip6}" != "${tunnel}" ] && ipproto='-6' |
| 33 |
|
| 34 |
ebegin "Creating tunnel ${IFVAR}" |
| 35 |
- ip tunnel add ${tunnel} name "${IFACE}" |
| 36 |
+ ip ${ipproto} tunnel add ${tunnel} name "${IFACE}" |
| 37 |
eend $? || return 1 |
| 38 |
_up |
| 39 |
fi |
Archives