[gentoo-commits] gentoo-x86 commit in sys-apps/baselayout/files: baselayout-1.12.14-iproute.patch

[Mike Frysinger (vapier)]

vapier      10/10/03 21:25:30

  Added:                baselayout-1.12.14-iproute.patch
  Log:
  Fix infinite recursion with ip invocation #339013 by Krzysztof Olędzki.
  
  (Portage version: 2.2_rc86/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-apps/baselayout/files/baselayout-1.12.14-iproute.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/files/baselayout-1.12.14-iproute.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/baselayout/files/baselayout-1.12.14-iproute.patch?rev=1.1&content-type=text/plain

Index: baselayout-1.12.14-iproute.patch
===================================================================
r3179 | vapier | 2010-10-03 17:20:25 -0400 (Sun, 03 Oct 2010) | 1 line

fix infinite recursion with ip invocation #339013 by Krzysztof Olędzki

Index: net-scripts/net/iproute2.sh
===================================================================
--- lib/rcscripts/net/iproute2.sh (revision 3178)
+++ lib/rcscripts/net/iproute2.sh (revision 3179)
@@ -5,7 +5,8 @@
 # Fix any potential localisation problems
 # Note that LC_ALL trumps LC_anything_else according to locale(7)
 ip() {
-	LC_ALL=C ip "$@"
+	# use the full path so we don't recurse into ip()
+	LC_ALL=C $(type -P ip) "$@"
 }
 iproute2_tunnel() {
 	LC_ALL=C ip tunnel "$@"