--- alx-src/branches/alxconf-060/functions/config_network.sh	2011/05/11 09:10:03	2032
+++ alx-src/branches/alxconf-060/functions/config_network.sh	2011/05/11 09:10:33	2033
@@ -59,6 +59,7 @@
 config_networking()
 {
 	local iface
+	local CONFIG
 
 	# first of all get the vars
 	get_network_settings
@@ -83,59 +84,58 @@
 	if [ ! -f /etc/modules.d/net.${iface} ] ||
 		[[ ${iface} != $(cat /etc/modules.d/net.${iface} | cut -d' ' -f2) ]]
 	then
-		echo "alias ${iface} ${ALX_MODULE}" > /etc/modules.d/net.${iface}
+		CONFIG=/etc/modules.d/net.${iface}
+		clearconfig
+		addconfig "alias ${iface} ${ALX_MODULE}"
 	fi
 
 	# update confd-networking default iface
 	[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
-	echo "${iface}" > ${SETTINGSPATH}/confd-networking
+	CONFIG=${SETTINGSPATH}/confd-networking
+	clearconfig
+	addconfig "${iface}"
 
 	# hostname && hosts
-	echo "${ALX_HOSTNAME}" > /etc/hostname
-	echo -e "127.0.0.1\tlocalhost.${ALX_DOMAIN}\tlocalhost\t${ALX_HOSTNAME}" > /etc/hosts
+	CONFIG=/etc/hostname
+	clearconfig
+	addconfig "${ALX_HOSTNAME}"
+	CONFIG=/etc/hosts
+	clearconfig
+	addconfig -e "127.0.0.1\tlocalhost.${ALX_DOMAIN}\tlocalhost\t${ALX_HOSTNAME}"
+	case ${ALX_NETWORKING} in
+		static|STATIC)
+			# add hostname with valid ip to hosts
+			addconfig -e "${ALX_IP}\t${ALX_HOSTNAME}.${ALX_DOMAIN}\t${ALX_HOSTNAME}"
+			;;
+	esac
 
 	# network devices
 
 	# always on boot
-	echo 'ONBOOT="yes"' > /etc/conf.d/net.${iface}
-	echo "NETWORKING=\"${ALX_NETWORKING}\"" >> /etc/conf.d/net.${iface}
+	CONFIG=/etc/conf.d/net.${iface}
+	clearconfig
 
+	addconfig 'ONBOOT="yes"'
+	addconfig "NETWORKING=\"${ALX_NETWORKING}\""
 	case ${ALX_NETWORKING} in
 		dhcp|DHCP)
-			echo 'DHCP_PROG="/sbin/udhcpc"' >> /etc/conf.d/net.${iface}
-			# -k kills the dhcp-cache at system shutdown
-			# -z will not
-			echo 'DHCP_STOP=""' >> /etc/conf.d/net.${iface}
+			addconfig 'DHCP_PROG="/sbin/udhcpc"'
+			addconfig 'DHCP_STOP=""'
 			#timeout after 10 seconds
-			echo 'DHCP_START="-t 10"' >> /etc/conf.d/net.${iface}
+			addconfig 'DHCP_START="-t 10"'
 			;;
 
 		static|STATIC)
-			# add hostname with valid ip to hosts
-			echo -e "${ALX_IP}\t${ALX_HOSTNAME}.${ALX_DOMAIN}\t${ALX_HOSTNAME}" >> /etc/hosts
-			echo "IP=\"${ALX_IP}\"" >> /etc/conf.d/net.${iface}
-			echo "NETMASK=\"${ALX_NETMASK}\"" >> /etc/conf.d/net.${iface}
-			echo "BROADCAST=\"${ALX_BROADCAST}\"" >> /etc/conf.d/net.${iface}
+			addconfig "IP=\"${ALX_IP}\""
+			addconfig "NETMASK=\"${ALX_NETMASK}\""
+			addconfig "BROADCAST=\"${ALX_BROADCAST}\""
 			;;
 	esac
 
-	# gateway or gateway overrides
-	if [[ ${ALX_GATEWAY} != NULL ]]
-	then
-		echo "GATEWAY=\"${ALX_GATEWAY}\"" >> /etc/conf.d/net.${iface}
-		echo "GATEWAY_IF=\"${iface}\"" >> /etc/conf.d/net.${iface}
-	fi
-
 	# force mac address override
 	if [[ ${ALX_FORCEMACTO} != NULL ]]
 	then
-		echo "FORCE_MAC_TO=\"${ALX_FORCEMACTO}\"" >> /etc/conf.d/net.${iface}
-	fi
-
-	# nameserver or nameserver overrides
-	if [[ ${ALX_DNS} != NULL ]]
-	then
-		echo "nameserver ${ALX_DNS}" > /etc/resolv.conf
+		addconfig "FORCE_MAC_TO=\"${ALX_FORCEMACTO}\""
 	fi
 
 	# wireless extensions
@@ -159,16 +159,35 @@
 		if [[ -n ${value} ]] && [[ ${value} != NULL ]]
 		then
 			# remove ALX_ from var
-			echo "${var/ALX_/}=\"${value}\"" >> /etc/conf.d/net.${iface}
+			addconfig "${var/ALX_/}=\"${value}\""
 		fi
 
 		# clear value
 		unset value
 	done
 
+	# FIXME !!!
 	# setup wpa-driver (only zydas atm)
-	[[ ${ALX_MODULE} = zd1211 ]] && \
-		echo "WIRELESS_WPA_DRIVER=zydas" >> /etc/conf.d/net.${iface}
+	if [[ ${ALX_MODULE} = zd1211 ]]
+	then
+		addconfig "WIRELESS_WPA_DRIVER=zydas"
+	fi
+
+	CONFIG=/etc/conf.d/net.routes
+	clearconfig
+	# gateway or gateway overrides
+	if [[ ${ALX_GATEWAY} != NULL ]]
+	then
+		addconfig "default gw ${ALX_GATEWAY}"
+	fi
+
+	CONFIG=/etc/resolv.conf
+	clearconfig
+	# nameserver or nameserver overrides
+	if [[ ${ALX_DNS} != NULL ]]
+	then
+		addconfig "nameserver ${ALX_DNS}"
+	fi
 
 	# unset all vars
 	unset ALX_HOSTNAME
@@ -193,4 +212,3 @@
 	unset ALX_WIRELESS_KEY
 	unset ALX_WIRELESS_KEY_ASCII
 }
-