--- mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/05/11 22:17:14	2081
+++ mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/05/18 22:27:54	2179
@@ -9,19 +9,58 @@
 NEW_PACKAGES_SERVER_PATH='packages/${ARCH}'
 NEW_MAGE_UNINSTALL_TIMEOUT=0
 
-# fix mage.rc
-for i in RSYNC MIRRORS MAGE_DISTRIBUTION PACKAGES_SERVER_PATH MAGE_UNINSTALL_TIMEOUT
-do
-	value="$(eval echo \${NEW_${i}})"
-	if [[ ! -z $(grep "^${i}=" ${MAGERC}) ]]
+CONFIGRC="/etc/alxconfig-ng/config.rc"
+NEW_ALX_NETWORKING="dhcp"
+NEW_ALX_DHCP_PROG="/sbin/udhcpc"
+NEW_ALX_DHCP_START="-t 10"
+NEW_ALX_DHCP_STOP=""
+
+read_value()
+{
+	local file=$1
+	local var=$2
+	local value
+
+	[[ ! -e ${file} ]] && return 1
+
+	value=$(source ${file}; echo $(eval echo \${${var}}))
+	echo "${value}"
+	return 0
+}
+
+updateconfig()
+{
+	local variables="$@"
+	local value
+	local i
+
+	if [[ -z ${CONFIG} ]]
 	then
-		echo "fixing $i -> ${value}"
-		sed -i "s|^\(${i}=\).*|\1\"${value}\"|" ${MAGERC}
-	else
-		echo "adding $i=${value}"
-		echo "${i}=\"${value}\"" >> ${MAGERC}
+		echo "You must define \$CONFIG varibale first!"
+		return 1
 	fi
-done
+
+	for i in ${variables}
+	do
+		value="$(eval echo \${NEW_${i}})"
+		if [[ ! -z $(grep "^${i}=" ${CONFIG}) ]]
+		then
+			echo "fixing ${i} -> ${value}"
+			sed -i "s|^\(${i}=\).*|\1\"${value}\"|" ${CONFIG}
+		else
+			echo "adding ${i}=${value}"
+			echo "${i}=\"${value}\"" >> ${CONFIG}
+		fi
+	done
+}
+
+# fix mage.rc
+CONFIG="${MAGERC}"
+updateconfig RSYNC MIRRORS MAGE_DISTRIBUTION PACKAGES_SERVER_PATH MAGE_UNINSTALL_TIMEOUT
+
+# fix config.rc
+CONFIG="${CONFIGRC}"
+updateconfig ALX_NETWORKING ALX_DHCP_PROG ALX_DHCP_START ALX_DHCP_STOP
 
 # fix profile
 if [[ $(readlink /etc/mage-profile) != */${MAGEPROFILE} ]]
@@ -53,6 +92,9 @@
 
 	# enable run of orphaned files check
 	touch /.orphaned
+
+	# tell that we're running an dist-upgrade
+	touch /.dist-upgrade
 fi
 
 # install new toolchain if not exist
@@ -66,6 +108,9 @@
 
 	# enable run of orphaned files check
 	touch /.orphaned
+
+	# tell that we're running an dist-upgrade
+	touch /.dist-upgrade
 fi
 
 # install new basesystem
@@ -81,6 +126,9 @@
 
 	# enable run of orphaned files check
 	touch /.orphaned
+
+	# tell that we're running an dist-upgrade
+	touch /.dist-upgrade
 fi
 
 # install remserial, if the plugin was enabled
@@ -92,51 +140,12 @@
 	touch /.orphaned
 fi
 
+# etc-update
+#etc-update
+
 # clean mage cache
 mage clean
 
-# # uninstall all other deprecated -alx packages
-# DEPRECATED="bzip2
-# 	gzip
-# 	perl
-# 	glib1
-# 	openssl
-# 	popt
-# 	libungif
-# 	samba
-# 	dhcpcd
-# 	openssh
-# 	wget
-# 	cups
-# 	ddcxinfo-knoppix
-# 	debianutils
-# 	grep
-# 	inetutils
-# 	kbd
-# 	less
-# 	net-tools
-# 	pciutils
-# 	procps
-# 	psmisc
-# 	sed
-# 	shadow
-# 	sysvinit
-# 	tar
-# 	which
-# 	gtk1+
-# 	ttmkfdir
-# 	xdialog"
-# 
-# echo "Searching for deprecated packages ..."
-# for i in ${DEPRECATED}
-# do
-# 	if [[ ! -z $(magequery -n ${i}-alx) ]]
-# 	then
-# 		echo "Removing deprecated mage-target '${i}-alx'"
-# 		mage uninstall ${i}-alx
-# 	fi
-# done
-
 echo "Searching for deprecated packages ..."
 for i in $(magequery -i | grep -- -alx | sed 's:.*/\(.*\)-.*-.*:\1:')
 do
@@ -152,6 +161,44 @@
 	mage uninstall ${i}
 done
 
+if [[ -f /.dist-upgrade ]]
+then
+	# array of wireless opts
+	WIRELESS_OPTS=( WIRELESS_BITRATE WIRELESS_CHANNEL WIRELESS_ESSID WIRELESS_FREQUENCY WIRELESS_MODE WIRELESS_NICK WIRELESS_AUTH_MODE WIRELESS_KEY_LENGTH WIRELESS_KEY WIRELESS_KEY_ASCII WIRELESS_WPA_DRIVER )
+
+	# fixing current dhcp network settings
+	#for i in $(grep -irl NETWORKING=.*dhcp.* /etc/conf.d/net.*)
+	for i in $(grep -irl DHCP_PROG=.*dhcpcd.* /etc/conf.d/net.*)
+	do
+		case ${i} in
+			*/net.sample) continue ;;
+			*/net.routes) continue ;;
+		esac
+
+		echo "fixing current dhcp network settings in '${i}'"
+		mv ${i}{,.orig}
+		onboot="$(read_value ${i}.orig ONBOOT)"
+		echo "ONBOOT=\"${onboot}\"" > ${i}
+		echo 'NETWORKING="dhcp"' >> ${i}
+		# check wireless extensions
+		for opt in ${WIRELESS_OPTS[*]}
+		do
+			value="$(read_value ${i}.orig ${opt})"
+			if [[ ! -z ${value} ]]
+			then
+				echo "${opt}=\"${value}\"" >> ${i}
+			fi
+		done
+		rm -f ${i}.orig
+	done
+	# search modules files
+	for i in $(find /etc/modules.d -name net.\*)
+	do
+		install -d /etc/modprobe.d
+		mv ${i} /etc/modprobe.d/${i%.conf}.conf
+	done
+fi
+
 if [[ -f /.orphaned ]]
 then
 	echo "Searching for orphaned files and directories ..."
@@ -159,5 +206,9 @@
 	rm -f /.orphaned
 fi
 
-# force a reboot at this point here
-reboot -f
+if [[ -f /.dist-upgrade ]]
+then
+	rm -f /.dist-upgrade
+	# force a reboot at this point here
+	reboot -f
+fi