* usr/lib/byobu/cpu_temp: LP: #1167176

- reorder cpu temp detection, as the previous order seemed to
    pick up GPU temps before CPU temps
This commit is contained in:
Dustin Kirkland 2013-08-16 15:57:54 -05:00
commit 0e1dd3fa8d
2 changed files with 5 additions and 2 deletions

3
debian/changelog vendored
View file

@ -6,6 +6,9 @@ byobu (5.56) unreleased; urgency=low
* usr/lib/byobu/network: LP: #1203601
- fix issue where /proc/net/dev isn't read correctly; use an
intermediate cache file
* usr/lib/byobu/cpu_temp: LP: #1167176
- reorder cpu temp detection, as the previous order seemed to
pick up GPU temps before CPU temps
-- Dustin Kirkland <kirkland@ubuntu.com> Sat, 10 Aug 2013 09:23:04 +0100

View file

@ -21,7 +21,7 @@
__cpu_temp_detail() {
local i
for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/temp*_input /sys/class/hwmon/hwmon*/device/temp*_input /proc/acpi/ibm/thermal /proc/acpi/thermal_zone/*/temperature; do
for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/device/temp*_input /sys/class/hwmon/hwmon*/temp*_input /proc/acpi/ibm/thermal /proc/acpi/thermal_zone/*/temperature; do
[ -r "$i" ] || continue
printf "%s\n" "$i:"
cat "$i"/*
@ -30,7 +30,7 @@ __cpu_temp_detail() {
__cpu_temp() {
local i t unit
for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/temp*_input /sys/class/hwmon/hwmon*/device/temp*_input /proc/acpi/ibm/thermal /proc/acpi/thermal_zone/*/temperature; do
for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/device/temp*_input /sys/class/hwmon/hwmon*/temp*_input /proc/acpi/ibm/thermal /proc/acpi/thermal_zone/*/temperature; do
case "$i" in
*temp*_input)
[ -s "$i" ] && read t < "$i" && t=$(($t/1000))