--- mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/05/12 18:51:46	2112
+++ mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/06/07 12:32:27	2181
@@ -1,6 +1,35 @@
 #!/bin/bash
 # $Id$
 
+# setup exit trap for reboot
+trap_exit()
+{
+	if [[ -f /.dist-upgrade ]]
+	then
+		rm -f /.dist-upgrade
+		# force a reboot at this point here
+		( sleep 3 && reboot -f & ); exit 0
+	fi	
+}
+trap "trap_exit" EXIT
+
+# get a suitable environment
+source /etc/profile
+
+MAGERC="/etc/mage.rc"
+MAGEPROFILE="alx-060"
+NEW_MAGE_DISTRIBUTION="unstable"
+NEW_RSYNC="rsync://magellan-linux.de/mage-alx-0.6.0"
+NEW_MIRRORS="http://magellan-linux.de/magellan/alx-0.6.0/${NEW_MAGE_DISTRIBUTION}"
+NEW_PACKAGES_SERVER_PATH='packages/${ARCH}'
+NEW_MAGE_UNINSTALL_TIMEOUT=0
+
+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
@@ -14,27 +43,39 @@
 	return 0
 }
 
-MAGERC="/etc/mage.rc"
-MAGEPROFILE="alx-060"
-NEW_MAGE_DISTRIBUTION="unstable"
-NEW_RSYNC="rsync://magellan-linux.de/mage-alx-0.6.0"
-NEW_MIRRORS="http://magellan-linux.de/magellan/alx-0.6.0/${NEW_MAGE_DISTRIBUTION}"
-NEW_PACKAGES_SERVER_PATH='packages/${ARCH}'
-NEW_MAGE_UNINSTALL_TIMEOUT=0
+updateconfig()
+{
+	local variables="$@"
+	local value
+	local i
 
-# 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}) ]]
+	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} ]]
@@ -125,6 +166,8 @@
 do
 	# excludes
 	case ${i} in
+		alxconfig-ng) continue ;;
+		alxinstall-ng) continue ;;
 		kernel-alx) continue ;;
 		kernel26-alx) continue ;;
 		kernel-sources-alx) continue ;;
@@ -135,13 +178,6 @@
 	mage uninstall ${i}
 done
 
-if [[ -f /.orphaned ]]
-then
-	echo "Searching for orphaned files and directories ..."
-	bash /etc/mage-profile/prune-orphaned-files
-	rm -f /.orphaned
-fi
-
 if [[ -f /.dist-upgrade ]]
 then
 	# array of wireless opts
@@ -172,11 +208,24 @@
 		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 /.dist-upgrade ]]
+if [[ -f /.orphaned ]]
 then
-	rm -f /.dist-upgrade
-	# force a reboot at this point here
-	reboot -f
+	echo "Searching for orphaned files and directories ..."
+	bash /etc/mage-profile/prune-orphaned-files
+	rm -f /.orphaned
 fi
+
+#if [[ -f /.dist-upgrade ]]
+#then
+#	rm -f /.dist-upgrade
+#	# force a reboot at this point here
+#	( reboot -f & ); exit 0
+#fi