--- mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/09/14 11:14:44	3200
+++ mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/09/28 15:11:22	3271
@@ -334,13 +334,30 @@
 	# install an appropriate uvesafb.conf
 	install -d /etc/modprobe.d || die
 	echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > /etc/modprobe.d/uvesafb.conf || die
+	# install an appropriate viafb.conf
+	echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > /etc/modprobe.d/viafb.conf || die
+	# install an appropriate i810fb.conf
+	echo "echo i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > /etc/modprobe.d/i810fb.conf || die
 	# create an updated initrd
 	DISKMODS="sd_mod"
 	OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
 	PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
 	SATAMODS="sata_via sata_sis sata_nv"
 	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
-	FBMODS="uvesafb"
+	if [ -x /usr/sbin/alx-hwdetection ]
+	then
+		case $(/usr/sbin/alx-hwdetection system) in
+			zotac) FBMODS="" ;;
+			rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
+			maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
+			standard) FBMODS="uvesafb" ;;
+			# unkown, use nothing to be safe
+			*) FBMODS="" ;;
+		esac
+	else
+		# unkown, use nothing to be safe
+		FBMODS=""
+	fi
 	echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
 	kernelver=$(readlink /boot/vmlinuz | sed 's:kernel-::')
 	# run depmod before
@@ -352,25 +369,28 @@
 
 if [[ -f /.dist-upgrade ]]
 then
-	echo "preparing for a reboot in 60 seconds ..."
-	# reboot via cronjob
-	[[ ! -d /var/spool/cron/crontabs ]] && install -d /var/spool/cron/crontabs
-	# setup a proper cronjob
-	tmp=$(mktemp)
-	:> ${tmp}
-	# fake mageupgrade to fix annoying error messages
-	if [[ ! -x /sbin/mageupgrade ]]
+	if [[ ${NOREBOOT} != 1 ]]
 	then
-		echo '#!/bin/sh' > /sbin/mageupgrade
-		echo 'exit 0'  >> /sbin/mageupgrade
-		chmod +x /sbin/mageupgrade
-		echo "* * * * * rm /sbin/mageupgrade" >> ${tmp}
+		echo "preparing for a reboot in 60 seconds ..."
+		# reboot via cronjob
+		[[ ! -d /var/spool/cron/crontabs ]] && install -d /var/spool/cron/crontabs
+		# setup a proper cronjob
+		tmp=$(mktemp)
+		:> ${tmp}
+		# fake mageupgrade to fix annoying error messages
+		if [[ ! -x /sbin/mageupgrade ]]
+		then
+			echo '#!/bin/sh' > /sbin/mageupgrade
+			echo 'exit 0'  >> /sbin/mageupgrade
+			chmod +x /sbin/mageupgrade
+			echo "* * * * * rm /sbin/mageupgrade" >> ${tmp}
+		fi
+		echo "* * * * * crontab -r && reboot -f" >> ${tmp}
+		crontab ${tmp}
+		[[ -f ${tmp} ]] && rm -f ${tmp}
+		# start cron daemon in background
+		crond -b -S
 	fi
-	echo "* * * * * crontab -r && reboot -f" >> ${tmp}
-	crontab ${tmp}
-	[[ -f ${tmp} ]] && rm -f ${tmp}
-	# start cron daemon in background
-	crond -b -S
 
 	rm -f /.dist-upgrade
 fi