--- mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/08/29 09:13:17	2790
+++ mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall	2011/09/28 13:07:28	3258
@@ -4,6 +4,8 @@
 # get a suitable environment
 source /etc/profile
 
+PATH="/etc/mage-profile:${PATH}"
+
 MAGERC="/etc/mage.rc"
 MAGEPROFILE="alx-060"
 NEW_MAGE_DISTRIBUTION="unstable"
@@ -93,6 +95,55 @@
 	grub-install --no-floppy "${bootdisk}"
 }
 
+# checks size of the mbr, if we are able to install grub2
+check_mbr_size()
+{
+	local hdd="$1"
+	local geometry_sectors
+	local partition_start_sector
+	local retval
+
+	hdd="$(mount | grep '/dev/' | grep ' / ' | cut -d' ' -f1 | sed 's:\(.*\)[0-9].*:\1:')"
+
+	if [[ -z ${hdd} ]]
+	then
+		echo "check_mbr_size(): No hdd given, aborting"
+		return 1
+	fi
+
+	# fix permissions
+	chmod +x /etc/mage-profile/sfdisk > /dev/null
+
+	# default retval is 0
+	retval=0
+
+	# check only if disk size is below 256mb
+	if [[ $(sfdisk -s ${hdd}) -lt 257000 ]]
+	then
+		geometry_sectors=$(sfdisk -g ${hdd} | sed 's:.*,\ \([0-9].*\)\ sectors.*:\1:')
+		partition_start_sector=$(sfdisk -d /dev/hda | grep /dev/hda1 | sed -e 's:.*start=\(.*\), size.*:\1:' -e 's:\ ::g')
+
+		# check start_sector / geomtry > 1 then everything is fine, else abort setup as grub may not install!
+		if [[ $(expr ${partition_start_sector} / ${geometry_sectors}) -gt 1 ]]
+		then
+			echo "Current partition setup is big enough, to install grub2 mbr to this disk."
+			retval=0
+		else
+			echo "Warning: Current partition setup to small, cannot install grub2 boot-sector to this disk."
+			echo "Maybe this is a *RANGEE* with a flash-disk =<256MB. Please re-install this client."
+			echo "Upgrade *not* supported!"
+			retval=1
+			killall mage &> /dev/null
+			killall update-alx &> /dev/null
+		fi
+	else
+			echo "Current disk is big enough, to install grub2 mbr to this disk."
+			retval=0
+	fi
+
+	return "${retval}"
+}
+
 # fix mage.rc
 CONFIG="${MAGERC}"
 updateconfig RSYNC MIRRORS MAGE_DISTRIBUTION PACKAGES_SERVER_PATH MAGE_UNINSTALL_TIMEOUT
@@ -116,6 +167,8 @@
 	[[ -e /dev/${rootdev} ]] && ln -snf ${rootdev} /dev/root
 fi
 
+check_mbr_size || exit 1
+
 # update mage3 -> mage4
 if [[ -z $(magequery -n mage) ]]
 then
@@ -236,6 +289,12 @@
 
 if [[ -f /.dist-upgrade ]]
 then
+	# busybox gets installed before the new busybox initscripts
+	# and the syslog daemon gets started at the wrong runlevels (rc3.d instead of rc.sysinit)
+	# these runlevel symlinks will be deleted by the prune-orphaned-files script
+	# and syslogd will be left never started. so add syslogd here
+	rc-config add syslogd
+
 	# 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 )
 
@@ -275,15 +334,31 @@
 	# 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
 	# 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
+			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
+	depmod -aF /boot/System.map-${kernelver}
 	mkinitrd -f /boot/initrd-${kernelver}.img ${kernelver}
 	# update grub bootloader
 	updategrub2
@@ -291,16 +366,28 @@
 
 if [[ -f /.dist-upgrade ]]
 then
-	echo "preparing 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)
-	echo "* * * * * crontab -r && reboot -f" > ${tmp}
-	crontab ${tmp}
-	[[ -f ${tmp} ]] && rm -f ${tmp}
-	# start cron daemon in background
-	crond -b -S
+	if [[ ${NOREBOOT} != 1 ]]
+	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 ]]
+		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
 
 	rm -f /.dist-upgrade
 fi