/[magellan-source]/trunk/magellan-initscripts/etc/rc.d/init.d/network

Diff of /trunk/magellan-initscripts/etc/rc.d/init.d/network

Parent Directory | Revision Log | View Patch Patch

-revision 270 by niro,
Tue Oct 11 11:19:58 2005 UTC
+revision 1090 by niro,
Wed Jul 14 07:25:22 2010 UTC
 Line 1
  #!/bin/bash
- # $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.10 2005-10-11 11:19:58 niro Exp $
+ # $Id$
  #%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"
+ 			echo -n "DHCP_PROG missing in net.${interface},"
- 			exit 1
+ 			echo "using default programm"
+ 			DHCP_PROG="/sbin/dhcpcd"
  		fi
+ 		[[ -z ${DHCP_START} ]] && DHCP_START="-t 10"
+ 		[[ -z ${DHCP_STOP} ]] && DHCP_STOP="-k"
  		;;
  	esac
-Line 120 
 onboot_interface_list()
+Line 127 
 onboot_interface_list()
  		if [[ $(read_value ONBOOT ${file}) = yes ]]
  		then
  			iface="$(basename ${file} | sed s/net.//)"
- 			# exclude backup files
+ 			# exclude backup files and exclude net.routes too
  			case "${iface}" in
  				*~) ;;
+ 				*/net.routes) ;;
  				*) devices="${devices} $(basename ${file} | sed s/net.//)" ;;
  			esac
  		fi
-Line 177 
 config_wireless_wpa()
+Line 185 
 config_wireless_wpa()
  	# check the configuration
  	[[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant.auto
  	[[ -z ${WIRELESS_WPA_SKEL} ]] && WIRELESS_WPA_SKEL=/etc/conf.d/wpa_supplicant.skel
- 	if [[ -z ${WIRELESS_WPA_DRIVER} ]]
- 	then
+ 	# use wext as default driver, do not abort here anymore
- 		echo "WPA: WIRELESS_WPA_DRIVER given. Aborting setup."
+ 	[[ -z ${WIRELESS_WPA_DRIVER} ]] && WIRELESS_WPA_DRIVER=wext
- 		return 1
- 	fi
  	# write a config with the settings from net.${iface}
  	# only wpa-psk ! all other needs manual setup
-Line 190 
 config_wireless_wpa()
+Line 196 
 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
+ 	# remove old state dir
+ 	[ -d /var/run/wpa_supplicant ] && rm -rf /var/run/wpa_supplicant
  	# now run the wpa_supplicant dameon
  	wpa_supplicant -B \
  		-D"${WIRELESS_WPA_DRIVER}" \
-Line 218 
 setup_wireless_extensions()
+Line 234 
 setup_wireless_extensions()
  		return 1
  	fi
- 	echo -e ${COLOREDSTAR}"Setting up wlan-ext for ${COLBLUE}${iface}${COLDEFAULT} ... "
+ 	if [[ -n ${WIRELESS_BITRATE} ]] ||
+ 		[[ -n ${WIRELESS_CHANNEL} ]] ||
+ 		[[ -n ${WIRELESS_ESSID} ]] ||
+ 		[[ -n ${WIRELESS_FREQUENCY} ]] ||
+ 		[[ -n ${WIRELESS_MODE} ]] ||
+ 		[[ -n ${WIRELESS_NICK} ]] ||
+ 		[[ -n ${WIRELESS_AUTH_MODE} ]]
+ 	then
+ 		echo -e ${COLOREDSTAR}"Setting up wlan-ext for ${COLBLUE}${iface}${COLDEFAULT} ... "
+ 	fi
  	[[ -n ${WIRELESS_BITRATE} ]] && iwconfig "${iface}" rate "${WIRELESS_BITRATE}"
  	[[ -n ${WIRELESS_CHANNEL} ]] && iwconfig "${iface}" channel "${WIRELESS_CHANNEL}"
-Line 228 
 setup_wireless_extensions()
+Line 253 
 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
+ }
+ config_bridge_devices()
+ {
+ 	local iface="$1"
+ 	local method="$2"
+ 	local bport
+ 	if [[ -z ${iface} ]]
+ 	then
+ 		echo "BRIDGE: no \$iface given. Aborting setup."
+ 		return 1
+ 	fi
+ 	if [[ -z ${method} ]]
+ 	then
+ 		echo "BRIDGE: no \$method given. Aborting setup."
+ 		return 1
+ 	fi
+ 	# first check for brctl
+ 	if [[ -z $(which brctl) ]]
+ 	then
+ 		echo "brctl not found! Please install 'net-misc/bridge-utils'."
+ 		return 1
+ 	fi
+ 	# check the config
+ 	if [[ -z ${BRIDGE_INTERFACES} ]]
+ 	then
+ 		echo "BRIDGE: no \$BRIDGE_INTERFACES given. Aborting setup."
+ 		return 1
+ 	fi
+ 	case ${method} in
+ 		add)
+ 			# setup the bridge device
+ 			brctl addbr ${iface}
+ 			for bport in ${BRIDGE_INTERFACES}
+ 			do
+ 				# enter promiscous mode
+ 				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)
+ 			for bport in ${BRIDGE_INTERFACE}
+ 			do
+ 				# bring the interface down
+ 				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_INTERFACES
+ 	# continue to setup generic networking
+ }
+ config_routes()
+ {
+ 	local method="$1"
+ 	local message
+ 	# only add and del are allowed
+ 	case ${method} in
+ 		add) message="Adding route ${COLBLUE}${route}${COLDEFAULT} ..." ;;
+ 		del) message="Removing route ${COLBLUE}${route}${COLDEFAULT} ..." ;;
+ 		*)
+ 			echo "config_routes: unsupported \$method '${method}'."
+ 			exit 1
+ 			;;
+ 	esac
+ 	# adds/delete user routes
+ 	if [[ -f /etc/conf.d/net.routes ]]
+ 	then
+ 		( cat /etc/conf.d/net.routes; echo ) | # make sure there is a LF at the end
+ 		while read route
+ 		do
+ 			case "${route}" in
+ 				\#*|"") continue ;;
+ 			esac
+ 			echo -e ${COLOREDSTAR}"${message}"
+ 			route ${method} ${route}
+ 			evaluate_retval
+ 		done
+ 	fi
  }
  networking_start()
  {
- 	local iface dns
+ 	local iface dns routes ALL_INTERFACES
+ 	if [[ -z $1 ]]
+ 	then
+ 		ALL_INTERFACES=$(onboot_interface_list ${network_settings}/net.*)
+ 	else
+ 		if [[ -e ${network_settings}/net.$1 ]]
+ 		then
+ 			ALL_INTERFACES="$1"
+ 		else
+ 			${FAILURE}
+ 			echo "Interface $1 does not exist. Aborting"
+ 			${NORMAL}
+ 			exit 1
+ 		fi
+ 	fi
  	# get list of all devices
- 	for iface in $(onboot_interface_list ${network_settings}/net.*)
+ 	for iface in ${ALL_INTERFACES}
  	do
  		# checkconfig
  		source ${network_settings}/net.${iface} || exit 1
  		checkconfig
  		# setup mac
- 		if [ -n "${FORCE_MAC_TO}" ]
+ 		if [[ -n ${FORCE_MAC_TO} ]]
  		then
  			echo -e ${COLOREDSTAR}"Faking MAC to ${FORCE_MAC_TO} for ${COLBLUE}${iface}${COLDEFAULT} ... "
  			ifconfig "${iface}" hw ether "${FORCE_MAC_TO}"
  			evaluate_retval
  		fi
- 		# activate the interface
+ 		# setup bridges
- 		ifconfig "${iface}" up
+ 		if [[ ${iface} = br[0-9]* ]]
+ 		then
+ 			config_bridge_devices ${iface} add
+ 		fi
  		# now configure wireless_extensions
  		[ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"
  		echo -e ${COLOREDSTAR}"Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."
+ 		# activate the interface
+ 		ifconfig "${iface}" up
  		# setup static or dhcp
  		case ${NETWORKING} in
  			dhcp|DHCP)
  				${CURS_UP}
  				${SET_WWCOL}
  				echo "[DHCP]"
- 				loadproc ${DHCP_PROG} ${DHCP_START}
+ 				loadproc "${DHCP_PROG}" "${DHCP_START}" "${iface}"
  				;;
  			static|STATIC)
  				${CURS_UP}
-Line 284 
 networking_start()
+Line 429 
 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
+ 		# whipe out the old one
+ 		echo "# Generated by the magellan-initscripts for ${iface}" > /etc/resolv.conf
+ 		# include head
+ 		if [ -f /etc/resolv.conf.head ]
+ 		then
+ 			cat /etc/resolv.conf.head >> /etc/resolv.conf
+ 		else
+ 			echo "# /etc/resolv.conf.head can replace this line" >> /etc/resolv.conf
+ 		fi
+ 		# add given nameserver
  		if [[ -n ${NAMESERVER} ]]
  		then
  			echo -e ${COLOREDSTAR}"Setting up all nameserver for ${COLBLUE}${iface}${COLDEFAULT} ..."
- 			# whipe out the old one
- 			echo "# Generated by the magellan-initscripts for ${iface}" > /etc/resolv.conf
  			for dns in ${NAMESERVER}
  			do
  				echo "nameserver ${dns}" >> /etc/resolv.conf
  			done
+ 			unset NAMESERVER
+ 		fi
+ 		# include tail
+ 		if [ -f /etc/resolv.conf.tail ]
+ 		then
+ 			cat /etc/resolv.conf.tail >> /etc/resolv.conf
+ 		else
+ 			echo "# /etc/resolv.conf.tail can replace this line" >> /etc/resolv.conf
  		fi
  	done
+ 	# setup user routes
+ 	config_routes add
  }
  networking_stop()
  {
+ 	if [[ -z $1 ]]
+ 	then
+ 		ALL_INTERFACES=$(onboot_interface_list ${network_settings}/net.*)
+ 	else
+ 		if [[ -e ${network_settings}/net.$1 ]]
+ 		then
+ 			ALL_INTERFACES="$1"
+ 		else
+ 			${FAILURE}
+ 			echo "Interface $1 does not exist. Aborting"
+ 			${NORMAL}
+ 			exit 1
+ 		fi
+ 	fi
  	# get list of all devices
- 	for iface in $(onboot_interface_list ${network_settings}/net.*)
+ 	for iface in ${ALL_INTERFACES}
  	do
  		source ${network_settings}/net.${iface} || exit 1
  		checkconfig
-Line 320 
 networking_stop()
+Line 502 
 networking_stop()
  		ifconfig ${iface} down
  		evaluate_retval
+ 		# remove bridges
+ 		if [[ ${iface} = br[0-9]* ]]
+ 		then
+ 			config_bridge_devices ${iface} remove
+ 		fi
  		# shutdown dhcp-daemon
  		if [[ ${NETWORKING} = dhcp ]] && [[ -n $(pidof ${DHCP_PROG}) ]]
  		then
-Line 337 
 networking_stop()
+Line 525 
 networking_stop()
  			killall wpa_supplicant
  		fi
  	done
  	# remove state dir
  	if [ -d /var/run/wpa_supplicant ]
  	then
  		rm -rf /var/run/wpa_supplicant
  	fi
+ 	# delete user routes
+ 	config_routes del
  }
  case $1 in
  	start)
- 		networking_start
+ 		networking_start $2
  		update_svcstatus $1
  		splash svc_started "$(basename $0)" 0
  		;;
  	stop)
- 		networking_stop
+ 		networking_stop $2
  		update_svcstatus $1
  		splash svc_stopped "$(basename $0)" 0
  		;;
-Line 365 
 case $1 in
+Line 556 
 case $1 in
  		;;
  	*)
- 		echo "Usage: $0 {start|stop|restart}"
+ 		echo "Usage: $0 {start|stop|restart} [interface]"
  		exit 1
  		;;
  esac

 Legend:



Removed from v.270
 


changed lines


 
Added in v.1090
 Legend:



Removed from v.270
 


changed lines


 
Added in v.1090
-Removed from v.270
+Added in v.1090