From 8c627efcbd559591360503deb4231a25ffa23190 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 28 Jan 2009 11:15:06 -0500
Subject: Use a leading path marker when sourcing files. (#482826)

bash 4 breaks the prior code.
---
 rc.d/init.d/network                         | 2 +-
 sysconfig/network-scripts/ifdown-ippp       | 2 +-
 sysconfig/network-scripts/ifup-aliases      | 6 +++---
 sysconfig/network-scripts/network-functions | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index c07c5a77..7695da46 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -241,7 +241,7 @@ case "$1" in
 	done
 	
 	for i in $vpninterfaces $xdslinterfaces $bridgeinterfaces $vlaninterfaces $remaining; do
-		(. ifcfg-$i
+		(. ./ifcfg-$i
 		if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi
 
 		if ! check_device_down $DEVICE; then
diff --git a/sysconfig/network-scripts/ifdown-ippp b/sysconfig/network-scripts/ifdown-ippp
index 54847cd4..3cc85640 100755
--- a/sysconfig/network-scripts/ifdown-ippp
+++ b/sysconfig/network-scripts/ifdown-ippp
@@ -7,7 +7,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 CONFIG=$1
 
-. $CONFIG
+. ./$CONFIG
 
 # stopping ibod daemon for channel bundling
 if [ -f /var/lock/subsys/ibod ] ; then
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 4c03941e..de4454e9 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -129,7 +129,7 @@ eval ` (
        exit 1
 }
 eval ` (
-       . $PARENTCONFIG;
+       . ./$PARENTCONFIG;
        echo default_NETMASK=$NETMASK\;;
        echo default_BROADCAST=$BROADCAST\;;
        echo default_GATEWAY=$GATEWAY\;;
@@ -321,7 +321,7 @@ if [ "$BASH_VERSINFO" ]; then shopt -s nullglob; else allow_null_glob_expansion=
 for FILE in ifcfg-${parent_device}:* ; do
        is_ignored_file "$FILE" && continue
        ini_env;
-       . $FILE;
+       . ./$FILE;
        [ -z "$DEVICE" ] && DEVICE=${FILE##ifcfg-}
        [ "$ONPARENT" != "no" -a "$ONPARENT" != "NO" ] && new_interface;
        unset DEVICE
@@ -330,7 +330,7 @@ done
 for FILE in ifcfg-${parent_device}-range* ; do
        is_ignored_file "$FILE" && continue
        ini_env;
-       . $FILE;
+       . ./$FILE;
 
        ipaddr_prefix=${IPADDR_START%.*}
        ipaddr_startnum=${IPADDR_START##*.}
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 05d0bca1..7c0dff8e 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -74,11 +74,11 @@ source_config ()
 	    echo $"Missing config file $PARENTCONFIG." >&2
 	    exit 1
 	}
-	. $PARENTCONFIG
-	[ -r "keys-$PARENTDEVNAME" ] && . keys-$PARENTDEVNAME
+	. ./$PARENTCONFIG
+	[ -r "keys-$PARENTDEVNAME" ] && . ./keys-$PARENTDEVNAME
     fi
-    . $CONFIG
-    [ -r "keys-$DEVNAME" ] && . keys-$DEVNAME
+    . ./$CONFIG
+    [ -r "keys-$DEVNAME" ] && . ./keys-$DEVNAME
     case "$TYPE" in
     	Ethernet)
 		DEVICETYPE="eth"
-- 
cgit v1.2.1