[Devil-linux-commit] build/config/etc/init.d network,1.22,1.23

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1:/tmp/cvs-serv30552/config/etc/init.d

Modified Files:
	network 
Log Message:
want if default gateway is set in sysconfig/config


Index: network
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/network,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- network	10 Oct 2003 14:28:50 -0000	1.22
+++ network	31 Dec 2003 17:37:05 -0000	1.23
@@ -55,7 +55,7 @@
 	local DEVICE=$1
 	# the dhcp client software options
 	local OPTIONS=""
-	
+
 	# check which dhcp client software to use
 	dhcp_client_check
 
@@ -93,17 +93,17 @@
 	local DEVICE=$1
 	# the signal to send to the dhcp client software
 	local SIGNAL=""
-	
+
 	# check which dhcp client software to use
 	dhcp_client_check
 
 	if [ "$DHCP_CLIENT" = "dhcpcd" ]; then
 		[ "$DHCLIENT_RELEASE_BEFORE_QUIT" = "yes" ] && SIGNAL="HUP"
 	fi
-	
+
 	echo -n "Stopping DHCP client daemon on interface $DEVICE"
 	killproc $DHCP_CLIENT $SIGNAL
-	
+
 	# wait for dhcp client to shut down
 	sleep 5
 }
@@ -124,7 +124,7 @@
 	MAC=
 	ROUTE=
 	BR_IF=
-	
+
 	#
 	# Load the variables from interface config file
 	#
@@ -167,7 +167,7 @@
 			# if this is a vlan interface we need to take special care for DHCPd
 			# FIXME: only needed for dhcp server not client, right?
 			#$VLAN set_flag $PHYDEV REORDER_HDR 1
-			
+
 			dhcp_client_start $DEVICE
 		else
 			BCAST=""; test -n "$BROADCAST" && BCAST="broadcast $BROADCAST"
@@ -327,15 +327,13 @@
 		test -n "$ONLY_INTERFACE" && exit
 
 		#
-		# If the /etc/sysconfig/network file contains a GATEWAY variable, set
-		# the default gateway and the interface through which the default
-		# gateway can be reached.
+		# If the /etc/sysconfig/network file contains a GATEWAY variable,
+		# warn the user that we don't support it anymore
 		#
 		if [ -n "$DEFAULTGATEWAY" -a -n "$DEFAULTGATEWAY_IF" ]; then
-			echo -n "Setting up routing for $DEFAULTGATEWAY_IF interface"
-			route add default gateway $DEFAULTGATEWAY \
-					metric 1 dev $DEFAULTGATEWAY_IF
-			evaluate_retval
+			echo -n "Setting of default gateway via /etc/sysconfig/config is not supported anymore"
+			print_status failure
+			echo "please set it in the interface configuration file"
 		fi
 
 		# enable IP Routing