--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2011/08/11 14:58:15	2736
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2012/03/28 09:50:05	3373
@@ -38,6 +38,9 @@
 GRUBLEGACYOPTS=""
 GRUB2OPTS=""
 
+# fdisk options
+FDISKPARTIONBELOW256MB=0
+
 # default specialdevices
 SPECIALDEVICE=""
 
@@ -204,6 +207,8 @@
 	run_hardware_detection
 	case "${SPECIALDEVICE}" in
 		zotac) echo "	\n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+		rangee) echo "	\n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+		maxdata) echo "	\n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;
 		*) echo "	\n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
 	esac
 
@@ -435,10 +440,14 @@
 #################################################
 run_hardware_detection()
 {
+	local hwinfo
+	
+	hwinfo="$(hwinfo --bios --storage --pci)"
+
 	# check for special devices/clients:
 	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
 	local removable=0
-	if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]
+	if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
 	then
 		for i in /sys/block/[hs]d*/removable
 		do
@@ -452,25 +461,94 @@
 		export GRUBLEGACYOPTS="rootdelay=8"
 		export SPECIALDEVICE="zotac"
 	fi
+
+	# check for special devices/clients:
+	# if a rangee and disk ist smaller then 256mb move partion one block further ahead
+	if [[ ! -z $(echo "${hwinfo}" | grep -i CLE266) ]]
+	then
+		# for a rangee always define partion startblock +1 
+		export FDISKPARTIONBELOW256MB="1"
+		export SPECIALDEVICE="rangee"
+		export GRUBLEGACYOPTS=""
+	fi
+
+	# check for special devices/clients:
+	# check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
+	if [[ ! -z $(echo "${hwinfo}" | grep -i i810) ]] || [[ ! -z $(echo "${hwinfo}" | grep -i i815) ]]
+	then
+		export SPECIALDEVICE="maxdata"
+		export GRUBLEGACYOPTS=""
+	fi
+}
+
+hdd_size_below_256mb()
+{
+	local hdd="$1"
+	local size
+	local retval
+	[[ -z ${hdd} ]] && die "Error: get_hdd_size() no \$hdd given!"
+
+	size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
+	if [[ ${size} -le 257000000 ]]
+	then
+		retval="0"
+	else
+		retval="1"
+	fi
+
+	return "${retval}"
 }
 
 setup_hdd_partitions_auto()
 {
 	ROOTHDD="${HDD}1"
 
+	# run this only if FDISKPARTITIONBELOW256MB is not already 1
+	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
+	then
+		if hdd_size_below_256mb ${HDD}
+		then
+			FDISKPARTIONBELOW256MB=1
+		else
+			FDISKPARTIONBELOW256MB=0
+		fi
+	fi
+
 	## delete disk
 	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
 
-	## setup one bootable partition
-	#1. n= new disk
-	#2. p= primary disk
-	#3. 1= first partition
-	#4. ''= default sector start
-	#5. ''= defaul sector end
-	#6. a= bootable flag
-	#7. 1= boot flag for partition 1
-	#8. w= write/quit
-	fdisk ${HDD} &> /dev/null << EOF
+	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
+	then
+		## setup one bootable partition
+		#1. n= new disk
+		#2. p= primary disk
+		#3. 1= first partition
+		#4. 2= default sector start // small disk needs more space for grub2 mbr sector
+		#5. ''= defaul sector end
+		#6. a= bootable flag
+		#7. 1= boot flag for partition 1
+		#8. w= write/quit
+		fdisk ${HDD} &> /dev/null << EOF
+n
+p
+1
+2
+
+a
+1
+w
+EOF
+	else
+		## setup one bootable partition
+		#1. n= new disk
+		#2. p= primary disk
+		#3. 1= first partition
+		#4. ''= default sector start
+		#5. ''= defaul sector end
+		#6. a= bootable flag
+		#7. 1= boot flag for partition 1
+		#8. w= write/quit
+		fdisk ${HDD} &> /dev/null << EOF
 n
 p
 1
@@ -480,6 +558,7 @@
 1
 w
 EOF
+	fi
 }
 
 setup_hdd_partitions_manuell()
@@ -662,12 +741,23 @@
 	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"
+	case ${SPECIALDEVICE} 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
+		*) FBMODS="uvesafb" ;;
+	esac
 
 	# install an appropriate uvesafb.conf
 	install -d ${INSTALLPATH}/etc/modprobe.d || die
 	echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die
 
+	# install an appropriate viafb.conf
+	echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die
+
+	# install an appropriate i810fb.conf
+	echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die
+
 	cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
 echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
 mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null