/[magellan-source]/trunk/initscripts/sysvinit/rc/network

Diff of /trunk/initscripts/sysvinit/rc/network

Parent Directory | Revision Log | View Patch Patch

-revision 522 by niro,
Sat Aug 18 18:44:15 2007 UTC
+revision 867 by niro,
Sat May  9 16:08:38 2009 UTC
 Line 1
  #!/bin/bash
- # $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.13 2007-08-18 18:44:15 niro Exp $
+ # $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.19 2008-12-22 22:01:15 niro Exp $
  #%rlevels: 0:k 1:k 2:k 3:s 4:s 5:s 6:k
  #%start: 20
 Line 10
  #%before:
  #%after:
- source /etc/sysconfig/rc
+ source /etc/conf.d/rc
  source ${rc_functions}
  # read values from files
 Line 24 
 read_value()
  	# global
  	local ONBOOT
  	local NETWORKING
  	# static
  	local IP
  	local NETMASK
 Line 60 
 read_value()
  	local WIRELESS_NICK
  	local WIRELESS_NWID
  	local WIRELESS_POWER
+ 	local WIRELESS_WPA_DRIVER
+ 	local BRIDGE_INTERFACES
+ 	local BRIDGE_STP
  	source ${file}
  	eval value=\$$(echo ${var})
-Line 68 
 read_value()
+Line 72 
 read_value()
  checkconfig()
  {
- 	if [ -z "${NETWORKING}" ]
+ 	if [[ -z ${NETWORKING} ]]
  	then
  		echo "NETWORKING missing in net.${interface}, aborted"
  		exit 1
-Line 76 
 checkconfig()
+Line 80 
 checkconfig()
  	case "${NETWORKING}" in
  	static)
- 		if [ -z "${IP}" ]
+ 		if [[ -z ${IP} ]]
  		then
  			echo "IP missing in net.${interface}, aborted"
  			exit 1
  		fi
- 		if [ -z "${NETMASK}" ]
+ 		if [[ -z ${NETMASK} ]]
  		then
  			echo -n "NETMASK missing in net.${interface}, "
  			echo "using 255.255.255.0"
  			NETMASK=255.255.255.0
  		fi
- 		if [ -z "${BROADCAST}" ]
+ 		if [[ -z ${BROADCAST} ]]
  		then
  			echo -n "BROADCAST missing in net.${interface}, "
  			echo "using default address"
-Line 97 
 checkconfig()
+Line 101 
 checkconfig()
  		;;
  	dhcp)
- 		if [ -z "${DHCP_PROG}" ]
+ 		if [[ -z ${DHCP_PROG} ]]
  		then
  			echo "DHCP_PROG missing in net.${interface}, aborted"
  			exit 1
-Line 191 
 config_wireless_wpa()
+Line 195 
 config_wireless_wpa()
  		# write default cfg from skeleton
  		cat ${WIRELESS_WPA_SKEL} > ${WIRELESS_WPA_CONFIG}
+ 		local wpa_proto
+ 		case ${WIRELESS_AUTH_MODE} in
+ 			wpa) wpa_proto="WPA" ;;
+ 			wpa2) wpa_proto="WPA2" ;;
+ 		esac
  		# setup the network entry
  		sed -i -e "s:@WIRELESS_ESSID@:${WIRELESS_ESSID}:g" \
- 			-e "s:@WIRELESS_KEY@:${WIRELESS_KEY}:g" \
+ 			-e "s:@WIRELESS_KEY@:${WIRELESS_KEY_ASCII}:g" \
+ 			-e "s:@WIRELESS_AUTH_MODE@:${wpa_proto}:g" \
  			${WIRELESS_WPA_CONFIG}
  	fi
-Line 241 
 setup_wireless_extensions()
+Line 252 
 setup_wireless_extensions()
  	[[ -n ${WIRELESS_NICK} ]] && iwconfig "${iface}" nick "${WIRELESS_NICK}"
  	case "${WIRELESS_AUTH_MODE}" in
- 		wpa)	config_wireless_wpa "${iface}" ;;
+ 		wpa|wpa2) config_wireless_wpa "${iface}" ;;
- 		wep|on)	config_wireless_wep "${iface}" ;;
+ 		wep|on) config_wireless_wep "${iface}" ;;
- 		off)	iwconfig "${iface}" enc off ;;
+ 		off) iwconfig "${iface}" enc off ;;
  	esac
  }
-Line 251 
 config_bridge_devices()
+Line 262 
 config_bridge_devices()
  {
  	local iface="$1"
  	local method="$2"
+ 	local bport
  	if [[ -z ${iface} ]]
  	then
-Line 272 
 config_bridge_devices()
+Line 284 
 config_bridge_devices()
  	fi
  	# check the config
- 	if [[ -z ${BRIDGE_INTERFACE} ]]
+ 	if [[ -z ${BRIDGE_INTERFACES} ]]
  	then
- 		echo "BRIDGE: no \$BRIDGE_INTERFACE given. Aborting setup."
+ 		echo "BRIDGE: no \$BRIDGE_INTERFACES given. Aborting setup."
  		return 1
  	fi
-Line 282 
 config_bridge_devices()
+Line 294 
 config_bridge_devices()
  		add)
  			# setup the bridge device
  			brctl addbr ${iface}
- 			# enter promiscous mode
+ 			for bport in ${BRIDGE_INTERFACES}
- 			ifconfig ${BRIDGE_INTERFACE} 0.0.0.0 promisc
+ 			do
- 			# now setup the bridge
+ 				# enter promiscous mode
- 			brctl addif ${iface} ${BRIDGE_INTERFACE}
+ 				ifconfig ${bport} 0.0.0.0 promisc
+ 				# now setup the bridge
+ 				brctl addif ${iface} ${bport}
+ 			done
+ 			# enable spanning-tree protocol
+ 			case ${BRIDGE_STP} in
+ 				on|off) brctl stp ${iface} ${BRIDGE_STP} ;;
+ 				*) echo "BRIDGE: unkown value \$BRIDGE_STP='$BRIDGE_STP'."; return 1 ;;
+ 			esac
  			;;
  		remove)
- 			# bring the interface down
+ 			for bport in ${BRIDGE_INTERFACE}
- 			ifconfig ${BRIDGE_INTERFACE} down
+ 			do
- 			# remove the interface from the bridge
+ 				# bring the interface down
- 			brctl delif ${iface} ${BRIDGE_INTERFACE}
+ 				ifconfig ${bport} down
+ 				# remove the interface from the bridge
+ 				brctl delif ${iface} ${bport}
+ 			done
  			# bring the bridge down
  			brctl delbr ${iface}
  			;;
  	esac
  	# unset the bridge variable to be safe
- 	unset BRIDGE_INTERFACE
+ 	unset BRIDGE_INTERFACES
  	# continue to setup generic networking
  }
-Line 404 
 networking_start()
+Line 428 
 networking_start()
  			echo -e ${COLOREDSTAR}"Setting up default gateway for ${COLBLUE}${iface}${COLDEFAULT} ..."
  			route add default gateway ${GATEWAY} metric 1 dev ${iface}
  			evaluate_retval
+ 			unset GATEWAY
  		fi
  		# setup /etc/resolv.conf
-Line 417 
 networking_start()
+Line 443 
 networking_start()
  			do
  				echo "nameserver ${dns}" >> /etc/resolv.conf
  			done
+ 			unset NAMESERVER
  		fi
  	done

 Legend:



Removed from v.522
 


changed lines


 
Added in v.867
 Legend:



Removed from v.522
 


changed lines


 
Added in v.867
-Removed from v.522
+Added in v.867