From a9e5dac976658e21449b7e8642e3a82f64eed82b Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Fri, 29 Jul 2016 11:55:18 -0500 Subject: [PATCH] * usr/lib/byobu/cpu_temp: LP: #1587139 - add cpu temp support for rpi1, rpi2, and rpi3 --- debian/changelog | 5 +++++ usr/lib/byobu/cpu_temp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6f9e67ca..fbc650ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ byobu (5.110) unreleased; urgency=medium + [ Dustin Kirkland ] * usr/lib/byobu/logo: - added a logo for AlpineLinux, which has published an apk for Byobu * usr/share/byobu/status/status, usr/share/byobu/status/statusrc: @@ -15,6 +16,10 @@ byobu (5.110) unreleased; urgency=medium * usr/lib/byobu/include/select-session.py: LP: #1583590 - fix default window selection by just hitting enter + [ ironstorm ] + * usr/lib/byobu/cpu_temp: LP: #1587139 + - add cpu temp support for rpi1, rpi2, and rpi3 + -- Dustin Kirkland Tue, 05 Jul 2016 10:47:25 -0500 byobu (5.109-0ubuntu1) yakkety; urgency=medium diff --git a/usr/lib/byobu/cpu_temp b/usr/lib/byobu/cpu_temp index 0c71a980..ccd86907 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*/device/temp*_input /sys/class/hwmon/hwmon*/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 /sys/class/thermal/thermal_zone*/temp; do [ -r "$i" ] || continue printf "%s\n" "$i:" cat "$i"/* @@ -30,9 +30,9 @@ __cpu_temp_detail() { __cpu_temp() { local i t unit - 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 + 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 /sys/class/thermal/thermal_zone*/temp; do case "$i" in - *temp*_input) + *temp*_input|*thermal_zone*/temp) [ -s "$i" ] && read t < "$i" && t=$(($t/1000)) ;; *)