dslinux/vendors/Nintendo/common/rc.d network

[stsp]

Update of /cvsroot/dslinux/dslinux/vendors/Nintendo/common/rc.d
In directory antilope:/tmp/cvs-serv6275/rc.d

Modified Files:
	network 
Log Message:
Modify network rc script to take advantage of wfcdump.
Patch by Tobias Gruetzmacher.


Index: network
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/common/rc.d/network,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- network	3 Jul 2006 22:31:01 -0000	1.10
+++ network	3 Jul 2006 23:38:44 -0000	1.11
@@ -5,6 +5,12 @@
 
 case "$1" in
 	start)
+		if [ -n "$wfc_config" ]
+		then
+			eval `wfcdump -c $wfc_config`
+			broadcast=
+		fi
+
 		if [ -n "$essid" ]
 		then
 			iwconfig_args=""
@@ -37,7 +43,7 @@
 		ifconfig nds down
 		sleep 1
 
-		if [ "$use_dhcp" = "YES" ]
+		if [ -z "$ip" ]
 		then
 			echo "Configuring network via DHCP."
 			# We have very little RAM, so use 'exec' to avoid
@@ -45,7 +51,7 @@
 			# the last command to run anyway if using dhcp.
 			exec udhcpc -n -q -i nds
 			### NOT REACHED ###
-		elif [ -n "$ip" ] && [ -n "$gateway" ]
+		elif [ -n "$gateway" ]
 		then
 
 			ifconfig_args=""
@@ -84,7 +90,7 @@
 			fi
 		else
 			echo "Not configuring network:"
-			echo "No static configuration found and DHCP is disabled."
+			echo "Static configuration incomplete and DHCP is disabled."
 			exit 1
 		fi