Define a proper PATH variable.

diff --git a/bridge-stp b/bridge-stp
index c79af4383e98560c1dd43cf7849b73104b8a01f8..04014b3301f219ab693057a3a75fc34cc07ff7d6 100755 (executable)
--- 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 c596286468f9d3c9438130feadafe827dd99f08b..46a3420f527205ecf2924a7b649e2125457e6122 100644 (file)
--- 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 a4af6e992d5f6334df032bf3b0e9b9bad74932eb..7871681c1688273e8519be4de06d8ebd59a430e3 100755 (executable)
--- 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}