--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in 2013/08/07 11:10:32 5006 +++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in 2014/04/22 10:55:06 5575 @@ -37,6 +37,7 @@ # grub options GRUBLEGACYOPTS="" GRUB2OPTS="" +GRUB2GFXPAYLOAD="1024x768x16,1024x768" # fdisk options FDISKPARTIONBELOW256MB=0 @@ -210,6 +211,7 @@ 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} ;; + i845) echo " \n\n\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;; *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;; esac if [[ ${FORMFACTOR} = laptop ]] @@ -464,7 +466,7 @@ # only add this for grub legacy, grub2 detect these settings on its own export GRUBLEGACYOPTS="rootdelay=8" - # there are to zotac types in the wild, nvidia based gfx and intel + # there are two zotac types in the wild, nvidia based gfx and intel if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]] then export SPECIALDEVICE="zotac_nvidia" @@ -491,6 +493,17 @@ export GRUBLEGACYOPTS="" fi + # check for i845 Chipsets and disable KMS and use 915 drm driver + if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]] + then + export SPECIALDEVICE="i845" + # unset default video=1024x768 opt or the drm driver breaks + export KERNELOPTS="quiet" + export GRUBLEGACYOPTS="" + # enable full kms support + export GRUB2GFXPAYLOAD="keep" + fi + # check for special devices/clients: # check for laptops and activate cpufreq scaling if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]] @@ -650,8 +663,10 @@ if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]] then sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die + sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die else echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" > ${INSTALLPATH}/etc/conf.d/grub || die + echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >> ${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 @@ -762,7 +777,7 @@ DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via" OTHERMODS="" case ${SPECIALDEVICE} in - zotac_intel) FBMODS=""; DRMMODS="i915" ;; + zotac_intel|i845) FBMODS=""; DRMMODS="i915" ;; zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;; rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards # not working with kms enabled drivers -> segfaults