--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2013/05/15 07:25:12	4853
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in	2013/08/07 10:42:07	5003
@@ -43,6 +43,7 @@
 
 # default specialdevices
 SPECIALDEVICE=""
+FORMFACTOR="desktop"
 
 # target filesystem
 FORMAT_FILESYSTEM="ext4"
@@ -211,6 +212,10 @@
 		maxdata) echo "	\n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;
 		*) echo "	\n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
 	esac
+	if [[ ${FORMFACTOR} = laptop ]]
+	then
+		echo "	\n\n\n \\ZnFormfactor Laptop erkannt, Powersave Modus 'ondemand' wird aktiviert!\\Zn \\" >> ${hwtmp} ;;
+	fi
 
 	echo "	\" 13 70" >> ${hwtmp}
 	chmod a+x ${hwtmp}
@@ -442,7 +447,7 @@
 {
 	local hwinfo
 	
-	hwinfo="$(hwinfo --bios --storage --pci --gfxcard)"
+	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
 
 	# check for special devices/clients:
 	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
@@ -485,6 +490,14 @@
 		export SPECIALDEVICE="maxdata"
 		export GRUBLEGACYOPTS=""
 	fi
+
+	# check for special devices/clients:
+	# check for laptops and activate cpufreq scaling
+	if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
+	then
+		export FORMFACTOR="laptop"
+		export KERNELOPTS="${KERNELOPTS} cpufreq.governor=ondemand"
+	fi
 }
 
 hdd_size_below_256mb()
@@ -747,6 +760,7 @@
 	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"
+	OTHERMODS=""
 	case ${SPECIALDEVICE} in
 		zotac_intel) FBMODS=""; DRMMODS="i915" ;;
 		zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
@@ -757,6 +771,11 @@
 		*) FBMODS="uvesafb" ;;
 	esac
 
+	if [[ ${FORMFACTOR} = laptop ]]
+	then
+		OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
+	fi
+
 	# 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
@@ -768,7 +787,7 @@
 	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
+echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
 mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
 exit 0
 CHROOTEOF