[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#603981: initramfs-tools: Load PowerMac G5 thermal modules



On Thu, Nov 18, 2010 at 10:09:59PM -0500, Milan Kupcevic wrote:
> The first patch did not include PowerMac9,1. Corrected patch is attached
> to this message.

oh fun, thought that linux-2.6 was fixed to autoload those modules.
 

> diff -Nru ./hooks/thermal ../initramfs-tools-0.98.5/hooks/thermal
> --- ./hooks/thermal	2010-09-23 14:43:51.000000000 -0400
> +++ ../initramfs-tools-0.98.5/hooks/thermal	2010-11-18 21:54:21.000000000 -0500
> @@ -22,19 +22,36 @@
>  case "$DPKG_ARCH" in
>  # copy the right modules
>  powerpc|ppc64)
> -	if [ -e /sys/bus/ps3_system_bus/ ]; then
> -		exit 0
> -	fi
why do you remove the ps3 check??

> -	manual_add_modules therm_pm72
> +
> +	# Only PowerMac G5 machines need these modules
> +
> +	MODEL="`grep model /proc/cpuinfo 2>/dev/null`"; MODEL="${MODEL##*: }"
please 2 lines and a check that /proc/cpuinfo is readable
(think of chroots)
> +
> +	case "$MODEL" in
> +	  RackMac3,1|PowerMac7,2|PowerMac7,3)
> +	    force_load therm_pm72
> +	    ;;
> +	  PowerMac8,1|PowerMac8,2)
> +	    force_load windfarm_pm81
> +	    ;;
> +	  PowerMac9,1)
> +	    force_load windfarm_pm91
> +	    ;;
> +	  PowerMac11,2)
> +	    force_load windfarm_pm112
> +	    ;;
> +	  PowerMac12,1)
> +	    force_load windfarm_pm121
> +	    ;;
> +	  *)
> +	    exit 0
hmm why this exit, seems bad for any other box?
> +	    ;;
> +	esac
>  	manual_add_modules windfarm_core
>  	manual_add_modules windfarm_cpufreq_clamp
>  	manual_add_modules windfarm_lm75_sensor
>  	manual_add_modules windfarm_max6690_sensor
>  	manual_add_modules windfarm_pid
> -	manual_add_modules windfarm_pm121
> -	manual_add_modules windfarm_pm112
> -	manual_add_modules windfarm_pm81
> -	manual_add_modules windfarm_pm91
>  	manual_add_modules windfarm_smu_controls
>  	manual_add_modules windfarm_smu_sat
>  	manual_add_modules windfarm_smu_sensors

otherwise this looks like a good workaround for this kernel bug.
please repost fixed patch.




Reply to: