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 A68481392EF for ; Thu, 17 Jul 2014 17:56:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E26DE0849; Thu, 17 Jul 2014 17:56:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 979F8E0826 for ; Thu, 17 Jul 2014 17:56:46 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF885340151 for ; Thu, 17 Jul 2014 17:56:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 651BA193E6 for ; Thu, 17 Jul 2014 17:56:44 +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: <1405538263.201434997a89ced0f6a672101498f83d7ca6786a.robbat2@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: net/ X-VCS-Repository: proj/netifrc X-VCS-Files: net/iproute2.sh X-VCS-Directories: net/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 201434997a89ced0f6a672101498f83d7ca6786a X-VCS-Branch: master Date: Thu, 17 Jul 2014 17:56:44 +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: 27b475a0-1174-4026-ade6-5f8e2c3180b5 X-Archives-Hash: 511ff27f7e22685e1554edc6adee278a commit: 201434997a89ced0f6a672101498f83d7ca6786a Author: Robin H. Johnson gentoo org> AuthorDate: Wed Jul 16 19:16:16 2014 +0000 Commit: Robin H. Johnson gentoo 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 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}"