--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2012/03/28 10:10:40	3376
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2013/05/13 12:11:18	4847
@@ -206,7 +206,7 @@
 	# other devices
 	run_hardware_detection
 	case "${SPECIALDEVICE}" in
-		zotac) echo "	\n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
+		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} ;;
@@ -442,7 +442,7 @@
 {
 	local hwinfo
 	
-	hwinfo="$(hwinfo --bios --storage --pci)"
+	hwinfo="$(hwinfo --bios --storage --pci --gfxcard)"
 
 	# check for special devices/clients:
 	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
@@ -459,7 +459,13 @@
 
 		# only add this for grub legacy, grub2 detect these settings on its own
 		export GRUBLEGACYOPTS="rootdelay=8"
-		export SPECIALDEVICE="zotac"
+		# there are to zotac types in the wild, nvidia based gfx and intel
+		if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
+		then
+			export SPECIALDEVICE="zotac_nvidia"
+		else
+			export SPECIALDEVICE="zotac_intel"
+		fi
 	fi
 
 	# check for special devices/clients:
@@ -742,7 +748,8 @@
 	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" ;;
+		zotac_intel) FBMODS=""; DRMMODS="i915" ;;
+		zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
 		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" ;;
@@ -835,7 +842,7 @@
 			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
+				sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die
 			fi
 		fi
 	fi