Fixed some path inforamtion and removed basename again.

diff --git a/src/initscripts/core/network b/src/initscripts/core/network
index 45418932a35396e611f4ef38508fc1aba71300cb..6f944d4a39cfd1185dfdc1b9f5615d89a3f0e5cb 100644 (file)
--- a/src/initscripts/core/network
+++ b/src/initscripts/core/network
@@ -24,9 +24,9 @@ case "${1}" in
                # Start all network interfaces
                for file in ${NETWORK_DEVICES}/*
                do
-                       interface=$(basename ${file})
+                       interface=${file##*/}
 
-                       IN_BOOT=1 ${NETWORK_DEVICES}/brup ${interface}
+                       IN_BOOT=1 ${NETWORK_SCRIPTS}/brup ${interface}
                done
                ;;
 
@@ -41,9 +41,9 @@ case "${1}" in
                # Stop all network interfaces
                for file in ${FILES}
                do
-                       interface=$(basename ${file})
+                       interface=${file##*/}
 
-                       IN_BOOT=1 ${NETWORK_DEVICES}/brdown ${interface}
+                       IN_BOOT=1 ${NETWORK_SCRIPTS}/brdown ${interface}
                done
                ;;
 

diff --git a/src/initscripts/networking/brdown b/src/initscripts/networking/brdown
index 05fab54291d940572fcc7d9a75803f07aa92cb7d..bb9105971ae8d1791c8de9c0a9939b3cb0dbb6e6 100644 (file)
--- a/src/initscripts/networking/brdown
+++ b/src/initscripts/networking/brdown
@@ -61,8 +61,8 @@ for file in ${FILES}; do
        (
                . ${file}
 
-               if [ -n "${SERVICE}" -a -x "${NETWORK_DEVICES}/services/${SERVICE}" ]; then
-                       IFCONFIG=${file} ${NETWORK_DEVICES}/services/${SERVICE} ${1} down
+               if [ -n "${SERVICE}" -a -x "${NETWORK_SCRIPTS}/services/${SERVICE}" ]; then
+                       IFCONFIG=${file} ${NETWORK_SCRIPTS}/services/${SERVICE} ${1} down
                else
                        echo -e "${FAILURE}Unable to process ${file}.  Either"
                        echo -e "${FAILURE}the SERVICE variable was not set,"

diff --git a/src/initscripts/networking/brup b/src/initscripts/networking/brup
index a57e6f3bf22bf3e353d165f65730f25add3daf70..011ac084f1b8fdabbe6c50487759f59ec51ac9c5 100644 (file)
--- a/src/initscripts/networking/brup
+++ b/src/initscripts/networking/brup
@@ -74,8 +74,8 @@ for file in ${FILES}; do
        (
                . ${file}
 
-               if [ -n "${SERVICE}" -a -x "${NETWORK_DEVICES}/services/${SERVICE}" ]; then
-                       IFCONFIG=${file} ${NETWORK_DEVICES}/services/${SERVICE} ${1} up
+               if [ -n "${SERVICE}" -a -x "${NETWORK_SCRIPTS}/services/${SERVICE}" ]; then
+                       IFCONFIG=${file} ${NETWORK_SCRIPTS}/services/${SERVICE} ${1} up
                else
                        echo -e "${FAILURE}Unable to process ${file}.  Either"
                        echo -e "${FAILURE}the SERVICE variable was not set,"

diff --git a/src/initscripts/sysconfig/rc.site b/src/initscripts/sysconfig/rc.site
index c1ed1d24cfdf7f69375d83c07e6f7d204a0be9a0..0e01424175d5214b80d9cce66266f956c4415b85 100644 (file)
--- a/src/initscripts/sysconfig/rc.site
+++ b/src/initscripts/sysconfig/rc.site
@@ -3,6 +3,7 @@ RC_BASE="/etc"
 RC_FUNCTIONS="${RC_BASE}/init.d/ipfire-functions"
 
 # Location of network device scripts and config files
+NETWORK_SCRIPTS="/etc/init.d/networking"
 NETWORK_DEVICES="/etc/sysconfig/network-devices"
 
 # Directory to store boot process accounting information