--- mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/08/11 12:08:18	2728
+++ mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/08/26 11:54:23	2780
@@ -18,7 +18,14 @@
 NEW_ALX_DHCP_START="-T 10 -t 5 -n -i"
 NEW_ALX_DHCP_STOP=""
 NEW_MIN_DISK_SPACE="85000"
-NEW_ALX_PLUGINS="/etc/alxconfig-ng/plugins"
+NEW_ALX_PLUGINS="/usr/lib/alxconfig-ng/plugins"
+NEW_ALX_FUNCTIONS="/usr/lib/alxconfig-ng/functions"
+
+# fake mage upgrade to prevent annoying error messages
+if [[ ! -x /usr/sbin/mageupgrade ]]
+then
+	mageupgrade() { true; }; export -f mageupgrade
+fi
 
 read_value()
 {
@@ -90,7 +97,7 @@
 
 # fix config.rc
 CONFIG="${CONFIGRC}"
-updateconfig ALX_NETWORKING ALX_DHCP_PROG ALX_DHCP_START ALX_DHCP_STOP MIN_DISK_SPACE ALX_PLUGINS
+updateconfig ALX_NETWORKING ALX_DHCP_PROG ALX_DHCP_START ALX_DHCP_STOP MIN_DISK_SPACE ALX_PLUGINS ALX_FUNCTIONS
 
 # fix profile
 if [[ $(readlink /etc/mage-profile) != */${MAGEPROFILE} ]]
@@ -99,6 +106,14 @@
 	ln -snf /usr/mage/profiles/${MAGEPROFILE} /etc/mage-profile
 fi
 
+# fix missing /dev/root device
+if [[ ! -e /dev/root ]]
+then
+	echo "fixing missing /dev/root symlink ..."
+	rootdev=$(basename $(mount | grep ' / ' | cut -d' ' -f1))
+	[[ -e /dev/${rootdev} ]] && ln -snf ${rootdev} /dev/root
+fi
+
 # update mage3 -> mage4
 if [[ -z $(magequery -n mage) ]]
 then
@@ -166,13 +181,6 @@
 then
 	# first keep some important files
 
-	# fix missing /dev/root device
-	if [[ ! -e /dev/root ]]
-	then
-		rootdev=$(basename $(mount | grep ' / ' | cut -d' ' -f1))
-		[[ ! -e /dev/${rootdev} ]] && ln -snf ${rootdev} /dev/root
-	fi
-
 	# export bootstrap to not start any services
 	export MAGE_BOOTSTRAP=true
 	mage install ${BASESYSTEM}
@@ -291,6 +299,8 @@
 	[[ -f ${tmp} ]] && rm -f ${tmp}
 	# start cron daemon in background
 	crond -b -S
+
+	rm -f /.dist-upgrade
 fi
 
 exit 0