Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] baselayout r3179 - branches/baselayout-1_12/net-scripts/net
Date: Sun, 03 Oct 2010 21:20:31
Message-Id: 20101003212026.0095E20051@flycatcher.gentoo.org
1 Author: vapier
2 Date: 2010-10-03 21:20:25 +0000 (Sun, 03 Oct 2010)
3 New Revision: 3179
4
5 Modified:
6 branches/baselayout-1_12/net-scripts/net/iproute2.sh
7 Log:
8 fix infinite recursion with ip invocation #339013 by Krzysztof Ol?\196?\153dzki
9
10 Modified: branches/baselayout-1_12/net-scripts/net/iproute2.sh
11 ===================================================================
12 --- branches/baselayout-1_12/net-scripts/net/iproute2.sh 2010-09-26 22:10:37 UTC (rev 3178)
13 +++ branches/baselayout-1_12/net-scripts/net/iproute2.sh 2010-10-03 21:20:25 UTC (rev 3179)
14 @@ -5,7 +5,8 @@
15 # Fix any potential localisation problems
16 # Note that LC_ALL trumps LC_anything_else according to locale(7)
17 ip() {
18 - LC_ALL=C ip "$@"
19 + # use the full path so we don't recurse into ip()
20 + LC_ALL=C $(type -P ip) "$@"
21 }
22 iproute2_tunnel() {
23 LC_ALL=C ip tunnel "$@"