--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2011/06/15 08:47:04	2387
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2012/03/28 10:10:40	3376
@@ -21,7 +21,7 @@
 ########################################
 
 ### System/Config Version
-VERSION="0.3.6"
+VERSION="%VERSIONTAG%"
 TITLE="alxinstall-ng - ${VERSION}"
 
 CDPATH="/mnt/cdrom"
@@ -31,8 +31,15 @@
 CURRENTLINE=0
 #TOTALLINES=11072 # -> now in images.conf
 
-# standart kernel opts
-KERNELOPTS="quiet"
+# standard kernel opts
+KERNELOPTS="quiet video=1024x768"
+
+# grub options
+GRUBLEGACYOPTS=""
+GRUB2OPTS=""
+
+# fdisk options
+FDISKPARTIONBELOW256MB=0
 
 # default specialdevices
 SPECIALDEVICE=""
@@ -200,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
 
@@ -431,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 $(lspci -v | grep -i zotac) ]]
+	if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
 	then
 		for i in /sys/block/[hs]d*/removable
 		do
@@ -444,28 +457,98 @@
 			fi
 		done
 
-		export KERNELOPTS="${KERNELOPTS} rootdelay=8"
+		# only add this for grub legacy, grub2 detect these settings on its own
+		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
@@ -475,6 +558,7 @@
 1
 w
 EOF
+	fi
 }
 
 setup_hdd_partitions_manuell()
@@ -531,71 +615,95 @@
 install_bootsector_chroot()
 {
 	local my_roothdd
+	local grubconf=${INSTALLPATH}/boot/grub/grub.conf
+	local grub2conf=/boot/grub/grub.cfg
 
-	### grubconf schreiben
-	source ${INSTALLPATH}/boot/kernelversion
-
-	#for alx only
-	if [ -e ${INSTALLPATH}/etc/alx_version ]
+	# check for grub2
+	if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]
 	then
-		OLD_ALXVER="${ALXVER}"
-		source ${INSTALLPATH}/etc/alx_version
-		KRNVER="ALX-${ALXVER}"
-		ALXVER="${OLD_ALXVER}"
-	fi
+		# needed by grub-mkconfig on the first run
+		if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]
+		then
+			install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die
+		fi
 
-	[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
-	[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
-	[[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
+		# set kernelopts
+		if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
+		then
+			sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
+		else
+			echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
+		fi
+		echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
+		echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
+		echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
+		echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die
 
-	# uuid support
-	if is_uuid_supported
-	then
-		my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
+	# grub-legacy
 	else
-		my_roothdd="${ROOTHDD}"
-	fi
+		### grubconf schreiben
+		source ${INSTALLPATH}/boot/kernelversion
 
-	local grubconf=${INSTALLPATH}/boot/grub/grub.conf
-	: > ${grubconf} || die
-	echo "default 0" >> ${grubconf} || die
-	echo "timeout 3" >> ${grubconf} || die
-	# using current root password
-	echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
+		#for alx only
+		if [ -e ${INSTALLPATH}/etc/alx_version ]
+		then
+			OLD_ALXVER="${ALXVER}"
+			source ${INSTALLPATH}/etc/alx_version
+			KRNVER="ALX-${ALXVER}"
+			ALXVER="${OLD_ALXVER}"
+		fi
 
-	echo  >> ${grubconf} || die
-	echo "# normal boot" >> ${grubconf} || die
-	echo "title ${KRNVER}" >> ${grubconf} || die
-	echo "root (hd0,0)" >> ${grubconf} || die
-	echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS}" >> ${grubconf} || die
-	if is_initrd_supported
-	then
-		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
-	fi
+		[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
+		[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
+		[[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
 
-	echo >> ${grubconf} || die
-	echo "# admin boot" >> ${grubconf} || die
-	echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
-	echo "lock"  >> ${grubconf} || die
-	echo "root (hd0,0)" >> ${grubconf} || die
-	echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} hardware-auto-detection" >> ${grubconf} || die
-	if is_initrd_supported
-	then
-		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
-	fi
+		# uuid support
+		if is_uuid_supported
+		then
+			my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
+		else
+			my_roothdd="${ROOTHDD}"
+		fi
 
-	echo >> ${grubconf} || die
-	echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
-	echo "lock"  >> ${grubconf} || die
-	echo "root (hd0,0)" >> ${grubconf} || die
-	echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} alx-reset-settings" >> ${grubconf} || die
-	if is_initrd_supported
-	then
-		echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
-	fi
+		: > ${grubconf} || die
+		echo "default 0" >> ${grubconf} || die
+		echo "timeout 3" >> ${grubconf} || die
+		# using current root password
+		echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
+
+		echo  >> ${grubconf} || die
+		echo "# normal boot" >> ${grubconf} || die
+		echo "title ${KRNVER}" >> ${grubconf} || die
+		echo "root (hd0,0)" >> ${grubconf} || die
+		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die
+		if is_initrd_supported
+		then
+			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+		fi
+
+		echo >> ${grubconf} || die
+		echo "# admin boot" >> ${grubconf} || die
+		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
+		echo "lock"  >> ${grubconf} || die
+		echo "root (hd0,0)" >> ${grubconf} || die
+		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die
+		if is_initrd_supported
+		then
+			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+		fi
 
-	# bootsector schreiben chrooted schreiben (lfs/magellan)
-	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
+		echo >> ${grubconf} || die
+		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
+		echo "lock"  >> ${grubconf} || die
+		echo "root (hd0,0)" >> ${grubconf} || die
+		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die
+		if is_initrd_supported
+		then
+			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+		fi
+
+		# bootsector schreiben chrooted schreiben (lfs/magellan)
+		cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
 /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
 root (hd0,0)
 setup (hd0)
@@ -603,16 +711,17 @@
 EOF
 exit 0
 CHROOTEOF
+	fi
 
 	## enters chroot
 	mount -t proc proc ${INSTALLPATH}/proc
 	mount -t sysfs sysfs ${INSTALLPATH}/sys
 	mount -o bind /dev ${INSTALLPATH}/dev
-	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i
+	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
 	umount ${INSTALLPATH}/proc
 	umount ${INSTALLPATH}/sys
 	umount ${INSTALLPATH}/dev
-	rm ${INSTALLPATH}/root/.bashrc
+	rm ${INSTALLPATH}/root/.installrc
 }
 
 is_initrd_supported()
@@ -627,8 +736,30 @@
 	# only generate initrds if the cmd exists
 	is_initrd_supported || return 0
 
-	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
-echo "MODULES=\"${FORMAT_FILESYSTEM} amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /etc/conf.d/mkinitrd
+	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"
+	case ${SPECIALDEVICE} in
+		zotac) FBMODS=""; DRMMODS="i915" ;;
+		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
 exit 0
 CHROOTEOF
@@ -637,11 +768,11 @@
 	mount -t proc proc ${INSTALLPATH}/proc
 	mount -t sysfs sysfs ${INSTALLPATH}/sys
 	mount -o bind /dev ${INSTALLPATH}/dev
-	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i
+	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
 	umount ${INSTALLPATH}/proc
 	umount ${INSTALLPATH}/sys
 	umount ${INSTALLPATH}/dev
-	rm ${INSTALLPATH}/root/.bashrc
+	rm ${INSTALLPATH}/root/.installrc
 }
 
 is_uuid_supported()
@@ -695,6 +826,19 @@
 
 	# install network config skeleton
 	install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
+
+	# intel framebufer quirk
+	if [[ -e /proc/fb ]]
+	then
+		if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
+		then
+			fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
+			if [[ ${fbdev} != 0 ]]
+			then
+				sed -i "s:^\(SPLASH_OPTS=\).*:\1\"-d /dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die
+			fi
+		fi
+	fi
 }
 
 install_system_settings_flash()
@@ -743,13 +887,14 @@
 	install_mount_rootfs
 	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
 
-	dialog_install_bootsector
-	install_bootsector_chroot
-
 	dialog_install_settings
 	sleep 1
 	install_system_settings
 	install_initrd_chroot
+
+	dialog_install_bootsector
+	install_bootsector_chroot
+
 	install_umount_rootfs
 	dialog_install_successful
 }
@@ -764,13 +909,14 @@
 	install_mount_rootfs_flash
 	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
 
-	dialog_install_bootsector
-	install_bootsector_chroot
-
 	dialog_install_settings
 	sleep 1
 	install_system_settings_flash
 	install_initrd_chroot
+
+	dialog_install_bootsector
+	install_bootsector_chroot
+
 	install_umount_rootfs_flash
 	dialog_install_successful
 }
@@ -785,13 +931,14 @@
 	install_mount_rootfs_flash
 	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
 
-	dialog_install_bootsector
-	install_bootsector_chroot
-
 	dialog_install_settings
 	sleep 1
 	install_system_settings_flash
 	install_initrd_chroot
+
+	dialog_install_bootsector
+	install_bootsector_chroot
+
 	install_umount_rootfs_flash
 	dialog_install_successful
 }