--- /usr/local/sbin/tp-fancontrol       2007-10-14 12:31:50.000000000 +0200
+++ /tmp/tp-fancontrol.html     2007-12-06 18:12:31.000000000 +0100
@@ -1,3 +1,4 @@
+
 #!/bin/bash
 
 # tp-fancontrol 0.3.02 (http://thinkwiki.org/wiki/ACPI_fan_control_script)
@@ -31,7 +32,7 @@
 THRESHOLDS=( #  Sensor     ThinkPad model
              #             R51     T41/2  Z60t   T43-26xx
 # min  max   #  ---------- ------- -----  -----  ---------------------------
-  50   68    #  EC 0x78    CPU     CPU    ?      CPU
+  50   70    #  EC 0x78    CPU     CPU    ?      CPU
   47   60    #  EC 0x79    miniPCI ?      ?      Between CPU and PCMCIA slot
   43   55    #  EC 0x7A    HDD     ?      ?      PCMCIA slot
   49   68    #  EC 0x7B    GPU     GPU    ?      GPU
@@ -44,7 +45,7 @@
   48   62    #  EC 0xC1    ?       n/a    ?      Southbridge (under miniPCI)
   50   65    #  EC 0xC2    ?       n/a    ?      Power circuitry (under CDC)
 
-  50   58    #  HDD        ->      ->     ->     Hard disk internal sensor
+  47   58    #  HDD        ->      ->     ->     Hard disk internal sensor
   47   60    #  HDAPS      ->      ->     ->     HDAPS readout (same as EC 0x79)
 )
 
@@ -53,10 +54,10 @@
 ANTIPULSE=( 0      1      1      0)  # Prevent fan pulsing noise at this level
                                      # (reduces frequency of fan RPM updates)
 
-OFF_THRESH_DELTA=2 # when gets this much cooler than 'min' above, may turn off fan
+OFF_THRESH_DELTA=3 # when gets this much cooler than 'min' above, may turn off fan
 MIN_THRESH_SHIFT=0 # increase min thresholds by this much
 MAX_THRESH_SHIFT=0 # increase max thresholds by this much
-MIN_WAIT=30 # minimum time (seconds) to spend in a given level before stepping down
+MIN_WAIT=180 # minimum time (seconds) to spend in a given level before stepping down
 
 IBM_ACPI=/proc/acpi/ibm
 HDAPS_TEMP=/sys/bus/platform/drivers/hdaps/hdaps/temp1
@@ -181,7 +182,7 @@
         LAST_DISK_TEMP="-128"
         for DEV in {sda,hda}; do
             if [[ -b "/dev/$DEV" ]]; then
-                local MODEL=`cat /sys/block/$DEV/device/model 2>/dev/null`
+                local MODEL=`cat /sys/block/$DEV/device/model`
                 if [[ "$MODEL" =~ "$HITACHI_MODELS" ]]; then
                     if HTEMP=`read_hitachi_temp "/dev/$DEV" 2>/dev/null`; then
                         LAST_DISK_TEMP="$HTEMP"
@@ -422,4 +423,4 @@
     [ -e "$PID_FILE" ] && echo "WARNING: daemon already running"
     set_priority
     control_fan
-fi
+fi