commit: 201434997a89ced0f6a672101498f83d7ca6786a Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Wed Jul 16 19:16:16 2014 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Wed Jul 16 19:17:43 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/netifrc.git;a=commit;h=20143499
iproute2: more ip6 tunnel modes. Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> X-Gentoo-Bug: 516920 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=516920 --- net/iproute2.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/iproute2.sh b/net/iproute2.sh index 7f0eccb..7918941 100644 --- a/net/iproute2.sh +++ b/net/iproute2.sh @@ -303,11 +303,14 @@ iproute2_pre_start() if [ -n "${tunnel}" ]; then # Set our base metric to 1000 metric=1000 - # Bug#347657: If the mode is 'ipip6' or 'ip6ip6', the -6 must be passed - # to iproute2 during tunnel creation. + # Bug#347657: If the mode is ipip6, ip6ip6, ip6gre or any, the -6 must + # be passed to iproute2 during tunnel creation. + # state 'any' does not exist for IPv4 local ipproto='' [ "${tunnel##mode ipip6}" != "${tunnel}" ] && ipproto='-6' [ "${tunnel##mode ip6ip6}" != "${tunnel}" ] && ipproto='-6' + [ "${tunnel##mode ip6gre}" != "${tunnel}" ] && ipproto='-6' + [ "${tunnel##mode any}" != "${tunnel}" ] && ipproto='-6' ebegin "Creating tunnel ${IFVAR}" veinfo ip ${ipproto} tunnel add ${tunnel} name "${IFACE}"
