Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

Parent Directory | Revision Log | Patch

	revision 3374 by niro, Wed Mar 28 09:54:00 2012 UTC	revision 4853 by niro, Wed May 15 07:25:12 2013 UTC
#	Line 206  dialog_hardware_detection()	Line 206  dialog_hardware_detection()
206	# other devices	# other devices
207	run_hardware_detection	run_hardware_detection
208	case "${SPECIALDEVICE}" in	case "${SPECIALDEVICE}" in
209	zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;	zotac*) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
210	rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;	rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;
211	maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;	maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;
212	*) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;	*) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
#	Line 442  run_hardware_detection()	Line 442  run_hardware_detection()
442	{	{
443	local hwinfo	local hwinfo
444
445	hwinfo="$(hwinfo --bios --storage --pci)"	hwinfo="$(hwinfo --bios --storage --pci --gfxcard)"
446
447	# check for special devices/clients:	# check for special devices/clients:
448	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
#	Line 459  run_hardware_detection()	Line 459  run_hardware_detection()
459
460	# only add this for grub legacy, grub2 detect these settings on its own	# only add this for grub legacy, grub2 detect these settings on its own
461	export GRUBLEGACYOPTS="rootdelay=8"	export GRUBLEGACYOPTS="rootdelay=8"
462	export SPECIALDEVICE="zotac"	# there are to zotac types in the wild, nvidia based gfx and intel
463		if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
464		then
465		export SPECIALDEVICE="zotac_nvidia"
466		else
467		export SPECIALDEVICE="zotac_intel"
468		fi
469	fi	fi
470
471	# check for special devices/clients:	# check for special devices/clients:
#	Line 742  install_initrd_chroot()	Line 748  install_initrd_chroot()
748	SATAMODS="sata_via sata_sis sata_nv"	SATAMODS="sata_via sata_sis sata_nv"
749	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
750	case ${SPECIALDEVICE} in	case ${SPECIALDEVICE} in
751	zotac) FBMODS="" ;;	zotac_intel) FBMODS=""; DRMMODS="i915" ;;
752		zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
753	rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards	rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
754	maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer	# not working with kms enabled drivers -> segfaults
755		#maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
756		maxdata) FBMODS="" ;;
757	*) FBMODS="uvesafb" ;;	*) FBMODS="uvesafb" ;;
758	esac	esac
759
#	Line 835  install_system_settings()	Line 844  install_system_settings()
844	fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')	fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
845	if [[ ${fbdev} != 0 ]]	if [[ ${fbdev} != 0 ]]
846	then	then
847	sed -i "s:^\(SPLASH_OPTS=\).*:\1\"-d /dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die	sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die
848	fi	fi
849	fi	fi
850	fi	fi

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.3374   changed lines   Added in v.4853