From b58484f8bf55c53e7b21287dde0a9c70d10ea660 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 17 Jun 2012 23:54:04 +0000
Subject: [PATCH] Define a proper PATH variable.

---
 bridge-stp    | 2 --
 functions     | 4 ++++
 ppp/ip-updown | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bridge-stp b/bridge-stp
index c79af438..04014b33 100755
--- a/bridge-stp
+++ b/bridge-stp
@@ -24,8 +24,6 @@ LOG_FACILITY=$(basename ${0})
 
 . /usr/lib/network/functions
 
-export PATH="/usr/sbin:/sbin:/usr/bin:/bin"
-
 zone=${1}
 action=${2}
 
diff --git a/functions b/functions
index c5962864..46a3420f 100644
--- a/functions
+++ b/functions
@@ -19,6 +19,10 @@
 #                                                                             #
 ###############################################################################
 
+# Make sure that helpers which are exec'ed have a working
+# PATH variable.
+export PATH="/usr/local/sbin:/usr/sbin:/sbin:/usr/bin:/bin:${PATH}"
+
 INIT_FUNCTIONS=""
 
 function init_register() {
diff --git a/ppp/ip-updown b/ppp/ip-updown
index a4af6e99..7871681c 100755
--- a/ppp/ip-updown
+++ b/ppp/ip-updown
@@ -20,7 +20,6 @@
 ###############################################################################
 
 umask 022
-export PATH=/usr/sbin:/sbin:/usr/bin:/bin
 
 # Give the variables we get passed by pppd an own namespace
 for i in IFNAME IPLOCAL IPREMOTE DNS1 DNS2 MACREMOTE LLLOCAL LLREMOTE; do
@@ -28,7 +27,7 @@ for i in IFNAME IPLOCAL IPREMOTE DNS1 DNS2 MACREMOTE LLLOCAL LLREMOTE; do
 	unset ${i}
 done
 
-. /lib/network/functions
+. /usr/lib/network/functions
 
 # Zone equals IFNAME
 ZONE=${PPP_IFNAME}
-- 
2.47.3