From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PrSV2-0001yA-8E for garchives@archives.gentoo.org; Mon, 21 Feb 2011 09:56:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79FE31C001; Mon, 21 Feb 2011 09:56:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4BC0B1C001 for ; Mon, 21 Feb 2011 09:56:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DEDA01B4143 for ; Mon, 21 Feb 2011 09:56:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 40D4F8006A for ; Mon, 21 Feb 2011 09:56:03 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <20480048cae39d6c3c8bb4fdb7bfc5cc842c61ca.robbat2@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: net/ X-VCS-Repository: proj/openrc X-VCS-Files: net/iproute2.sh X-VCS-Directories: net/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 20480048cae39d6c3c8bb4fdb7bfc5cc842c61ca Date: Mon, 21 Feb 2011 09:56:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 401726cbea42b27f42d00d5adc10b52d commit: 20480048cae39d6c3c8bb4fdb7bfc5cc842c61ca Author: Robin H. Johnson gentoo org> AuthorDate: Mon Feb 21 09:53:51 2011 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Feb 21 09:55:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D20480048 net/iproute2: Pass required explicit -6 for IPv6 tunnels (#347657) Tunnel modes ipip6 and ip6ip6 require an explicit family selection for the ip tunnel call. Signed-off-by: Robin H. Johnson gentoo.org> X-Gentoo-Bug: 347657 --- net/iproute2.sh | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/net/iproute2.sh b/net/iproute2.sh index 6194faf..a2e9db7 100644 --- a/net/iproute2.sh +++ b/net/iproute2.sh @@ -239,9 +239,14 @@ iproute2_pre_start() if [ -n "${tunnel}" ]; then # Set our base metric to 1000 metric=3D1000 + # Bug#347657: If the mode is 'ipip6' or 'ip6ip6', the -6 must be passe= d + # to iproute2 during tunnel creation. + local ipproto=3D'' + [ "${tunnel##mode ipip6}" !=3D "${tunnel}" ] && ipproto=3D'-6' + [ "${tunnel##mode ip6ip6}" !=3D "${tunnel}" ] && ipproto=3D'-6' =20 ebegin "Creating tunnel ${IFVAR}" - ip tunnel add ${tunnel} name "${IFACE}" + ip ${ipproto} tunnel add ${tunnel} name "${IFACE}" eend $? || return 1 _up fi