Always "cd /etc/sysconfig/network-scripts" before sourcing network_functions.

10 files changed, 13 insertions, 11 deletions

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 13a0338e..94fe5593 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -2,7 +2,6 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 cd /etc/sysconfig/network-scripts
-
 . network-functions
 
 CONFIG=$1
diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post
index 5df3f564..5ef7c293 100755
--- a/sysconfig/network-scripts/ifdown-post
+++ b/sysconfig/network-scripts/ifdown-post
@@ -3,9 +3,9 @@
 # it is brought down explicitly.
 
 cd /etc/sysconfig/network-scripts
+. network-functions
 
 CONFIG=$1
-. network-functions
 source_config
 
 # Notify programs that have requested notification
diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp
index 299fb8a9..5faf753e 100755
--- a/sysconfig/network-scripts/ifdown-ppp
+++ b/sysconfig/network-scripts/ifdown-ppp
@@ -2,9 +2,9 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 cd /etc/sysconfig/network-scripts
+. network-functions
 
 CONFIG=$1
-. network-functions
 source_config
 
 if [ ! -f /var/run/ppp-$DEVICE.dev ]; then
diff --git a/sysconfig/network-scripts/ifdown-sl b/sysconfig/network-scripts/ifdown-sl
index a7b2d8ba..0bb9d425 100755
--- a/sysconfig/network-scripts/ifdown-sl
+++ b/sysconfig/network-scripts/ifdown-sl
@@ -2,9 +2,9 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 cd /etc/sysconfig/network-scripts
+. network-functions
 
 CONFIG=$1
-. network-functions
 source_config
 
 # signals ifup-sl not to persist
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index a0675948..5762a9fa 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -2,7 +2,6 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 cd /etc/sysconfig/network-scripts
-
 . network-functions
 
 need_hostname
diff --git a/sysconfig/network-scripts/ifup-ipx b/sysconfig/network-scripts/ifup-ipx
index 848af535..1a966ad3 100755
--- a/sysconfig/network-scripts/ifup-ipx
+++ b/sysconfig/network-scripts/ifup-ipx
@@ -18,7 +18,6 @@ fi
 case $IPX in yes|true) ;; *) exit 0 ;; esac
 
 cd /etc/sysconfig/network-scripts
-
 . network-functions
 
 CONFIG=$1
diff --git a/sysconfig/network-scripts/ifup-plip b/sysconfig/network-scripts/ifup-plip
index c1e01d53..25c36fea 100755
--- a/sysconfig/network-scripts/ifup-plip
+++ b/sysconfig/network-scripts/ifup-plip
@@ -1,8 +1,10 @@
 #!/bin/sh
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
-CONFIG=$1
+cd /etc/sysconfig/network-scripts
 . network-functions
+
+CONFIG=$1
 source_config
 
 if [ "foo$2" = "fooboot" -a "${ONBOOT}" = "no" ]
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index 414bae6a..789afd12 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -1,11 +1,10 @@
 #!/bin/sh
 
 cd /etc/sysconfig/network-scripts
-
-CONFIG=$1
 . network-functions
 
 need_hostname
+CONFIG=$1
 source_config
 
 DEVICETYPE=`echo $DEVICE | sed "s/[0-9]*$//"`
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index ecdeae97..a6b4a781 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -11,8 +11,10 @@ if [ "$1" != daemon ] ; then
 fi
 shift
 
-CONFIG=$1
+cd /etc/sysconfig/network-scripts
 . network-functions
+
+CONFIG=$1
 source_config
 
 if [ -z "$DISCONNECTTIMEOUT" ]; then
diff --git a/sysconfig/network-scripts/ifup-sl b/sysconfig/network-scripts/ifup-sl
index 50ddbad8..c39f5d4e 100755
--- a/sysconfig/network-scripts/ifup-sl
+++ b/sysconfig/network-scripts/ifup-sl
@@ -12,8 +12,10 @@ if [ "$1" != daemon ] ; then
 fi
 shift
 
-CONFIG=$1
+cd /etc/sysconfig/network-scripts
 . network-functions
+
+CONFIG=$1
 source_config
 
 if [ "foo$2" = "fooboot" -a ${ONBOOT} = "no" ]