SVN: rc-scripts/trunk/rc.d/init.d/network

[glen]

Author: glen
Date: Thu Dec  7 22:45:42 2006
New Revision: 8083

Modified:
   rc-scripts/trunk/rc.d/init.d/network
Log:
Small reorganizing.

Modified: rc-scripts/trunk/rc.d/init.d/network
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/network	(original)
+++ rc-scripts/trunk/rc.d/init.d/network	Thu Dec  7 22:45:42 2006
@@ -7,22 +7,22 @@
 #		start at boot time.
 #
 # probe:	true
-
 # $Id$
 
-# Source function library.
-. /etc/rc.d/init.d/functions
-. /etc/sysconfig/network-scripts/functions.network
-
 if [ ! -f /etc/sysconfig/network ]; then
+	. /etc/rc.d/init.d/functions
 	nls "%s is missing. Can't continue." "/etc/sysconfig/network"
 	exit 1
 fi
 
 . /etc/sysconfig/network
 
+# Source function library.
+. /etc/rc.d/init.d/functions
+. /etc/sysconfig/network-scripts/functions.network
+
 # Will be removed in the future
-if is_yes "$NETWORKING" ; then
+if [ -n "$NETWORKING" ] && is_yes "$NETWORKING"; then
 	if [ -z "$IPV4_NETWORKING" ] ; then
 		echo "NETWORKING is set to YES, but IPV4_NETWORKING is empty!"
 		echo "Please upgrade your config"
@@ -190,6 +190,8 @@
 	rm -f /var/lock/subsys/network
 }
 
+
+find_boot_interfaces() {
 ifcfg_files="$(network_interface_configs 'ifcfg-*')"
 bootprio=$(grep '^BOOTPRIO=' $ifcfg_files)
 
@@ -256,6 +258,9 @@
 		is_yes "$ONBOOT" && echo "${i##*/tnlcfg-}"
 	done
 `
+}
+
+find_boot_interfaces
 
 # See how we were called.
 case "$1" in