--- trunk/installer/ncurses-gui/networking.sh	2010/05/30 18:29:43	1034
+++ trunk/installer/ncurses-gui/networking.sh	2010/05/30 18:37:54	1035
@@ -1,48 +1,5 @@
 # $Id$
 
-# network_config()
-# {
-# 	local retval
-# 	local i
-# 	local highlite
-# 	local tag
-# 	local item
-# 
-# 	retval=-1
-# 	while [ ${retval} != 1 ] && [ ${retval} != 250 ] && [ ${retval} != 0 ]
-# 	do
-# 		i=$(dialog \
-# 			--stdout \
-# 			--colors \
-# 			--title "Network Configuration" \
-# 			--backtitle "${TITLE}" \
-# 			--default-item "${highlite}" \
-# 			--inputmenu "Enter a Hostname" 16 70 10 \
-# 			"Hostname:" "${NETWORK_HOSTNAME}" \
-# 			"Domain:" "${NETWORK_DOMAIN}")
-# 		retval="$?"
-# 		highlite="$(echo "$i" | sed -e 's/^RENAMED //' -e 's/:.*//'):"
-# # 		echo "DEBUG: ${highlite}"
-# # 		read
-# 		case ${retval} in
-# 			0)
-# 				export NETWORK_HOSTNAME
-# 				export NETWORK_DOMAIN
-# 				;;
-# 			3)
-# 				tag=$(echo "${i}" | sed -e 's/^RENAMED //' -e 's/:.*//')
-# 				item=$(echo "${i}" | sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//')
-# 				case "${tag}" in
-# 					Hostname) NETWORK_HOSTNAME="${item}" ;;
-# 					Domain) NETWORK_DOMAIN="${item}" ;;
-# 				esac
-# 				;;
-# 		esac
-# 	done
-# 
-# 	return ${retval}
-# }
-
 network_config()
 {
 	dialog \
@@ -71,58 +28,6 @@
 	return $?
 }
 
-# network_config_static()
-# {
-# 	local retval
-# 	local i
-# 	local highlite
-# 	local tag
-# 	local item
-# 
-# 	retval=-1
-# 	while [ ${retval} != 1 ] && [ ${retval} != 250 ] && [ ${retval} != 0 ]
-# 	do
-# 		i=$(dialog \
-# 			--stdout \
-# 			--colors \
-# 			--title "Network Configuration" \
-# 			--backtitle "${TITLE}" \
-# 			--default-item "${highlite}" \
-# 			--inputmenu "Static network setup" 25 70 15 \
-# 			"IP:" "${NETWORK_IP}" \
-# 			"Netmask:" "${NETWORK_NETMASK}" \
-# 			"Broadcast:" "${NETWORK_BROADCAST}" \
-# 			"Gateway:" "${NETWORK_GATEWAY}" \
-# 			"Nameserver:" "${NETWORK_NAMESERVER}")
-# 		retval="$?"
-# 		highlite="$(echo "$i" | sed -e 's/^RENAMED //' -e 's/:.*//'):"
-# # 		echo "DEBUG: ${highlite}"
-# # 		read
-# 		case ${retval} in
-# 			0)
-# 				export NETWORK_IP
-# 				export NETWORK_NETMASK
-# 				export NETWORK_BROADCAST
-# 				export NETWORK_GATEWAY
-# 				export NETWORK_NAMESERVER
-# 				;;
-# 			3)
-# 				tag=$(echo "${i}" | sed -e 's/^RENAMED //' -e 's/:.*//')
-# 				item=$(echo "${i}" | sed -e 's/^.*:[ ]*//' -e 's/[ ]*$//')
-# 				case "${tag}" in
-# 					IP) NETWORK_IP="${item}" ;;
-# 					Netmask) NETWORK_NETMASK="${item}" ;;
-# 					Broadcast) NETWORK_BROADCAST="${item}" ;;
-# 					Gateway) NETWORK_GATEWAY="${item}" ;;
-# 					Nameserver) NETWORK_NAMESERVER="${item}" ;;
-# 				esac
-# 				;;
-# 		esac
-# 	done
-# 
-# 	return ${retval}
-# }
-
 network_config_static()
 {
 	dialog \
@@ -180,35 +85,6 @@
 	return 0
 }
 
-# rundialog_network_config()
-# {
-# 	network_config
-# 	case $? in
-# 		-1)	die "Error!" ;;
-# 		255)	die "aborted by user" ;;
-# 
-# 		1)
-# 			rundialog_network_config
-# 			;;
-# 
-# 		# vars already exported
-# 		0)
-# 			if [[ -z ${NETWORK_HOSTNAME} ]]
-# 			then
-# 				messagebox "Warning" "No hostname given." 10 40
-# 				rundialog_network_config
-# 			elif [[ -z ${NETWORK_DOMAIN} ]]
-# 			then
-# 				messagebox "Warning" "No domain given." 10 40
-# 				rundialog_network_config
-# 			fi
-# 			;;
-# 	esac
-# 
-# 	debug "NETWORK_HOSTNAME='${NETWORK_HOSTNAME}'"
-# 	debug "NETWORK_DOMAIN='${NETWORK_DOMAIN}'"
-# }
-
 rundialog_network_config()
 {
 	local NETWORK_CONFIG
@@ -276,32 +152,6 @@
 	debug "NETWORK_METHOD='${NETWORK_METHOD}'"
 }
 
-# rundialog_network_config_static()
-# {
-# 	network_config_static
-# 	case $? in
-# 		-1)	die "Error!" ;;
-# 		255)	die "aborted by user" ;;
-# 
-# 		1)
-# 			rundialog_network_select_nic
-# 			rundialog_network_config_static
-# 			;;
-# 
-# 		0)	if ! check_static_network_config
-# 			then
-# 				rundialog_network_config_static
-# 			fi
-# 			;;
-# 	esac
-# 
-# 	debug "NETWORK_IP='${NETWORK_IP}'"
-# 	debug "NETWORK_NETMASK='${NETWORK_NETMASK}'"
-# 	debug "NETWORK_BROADCAST='${NETWORK_BROADCAST}'"
-# 	debug "NETWORK_GATEWAY='${NETWORK_GATEWAY}'"
-# 	debug "NETWORK_NAMESERVER='${NETWORK_NAMESERVER}'"
-# }
-
 rundialog_network_config_static()
 {
 	local NETWORK_CONFIG
@@ -362,5 +212,4 @@
 {
 	rundialog_network_config
 	rundialog_network_config_select
-	#rundialog_network_select_nic
 }