From 0e1dd3fa8daa1e856fde5fe5a5998f6838ed820e Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Fri, 16 Aug 2013 15:57:54 -0500 Subject: [PATCH] * usr/lib/byobu/cpu_temp: LP: #1167176 - reorder cpu temp detection, as the previous order seemed to pick up GPU temps before CPU temps --- debian/changelog | 3 +++ usr/lib/byobu/cpu_temp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 388b4acb..d888ef07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sat, 10 Aug 2013 09:23:04 +0100 diff --git a/usr/lib/byobu/cpu_temp b/usr/lib/byobu/cpu_temp index c1a0172a..ddc2b70a 100755 --- a/usr/lib/byobu/cpu_temp +++ b/usr/lib/byobu/cpu_temp @@ -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))