diff --git a/debian/changelog b/debian/changelog index 65366d8c..68421d3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ byobu (3.11) unreleased; urgency=low + [ Dustin Kirkland ] * README: minor edit to the instructions; tested and working for me now - -- Dustin Kirkland Mon, 22 Nov 2010 18:39:14 -0600 + [ Marcin Juszkiewicz ] + * usr/lib/byobu/cpu_freq: fix cpu frequency detection on ARM, LP: #675442 + + -- Dustin Kirkland Wed, 24 Nov 2010 12:43:03 -0600 byobu (3.10-0ubuntu1) natty; urgency=low diff --git a/usr/lib/byobu/cpu_freq b/usr/lib/byobu/cpu_freq index eedb2cfe..8648598d 100755 --- a/usr/lib/byobu/cpu_freq +++ b/usr/lib/byobu/cpu_freq @@ -28,8 +28,8 @@ fi if [ -r "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" ]; then freq=$(awk '{ printf "%.1f", $1 / 1000000 }' /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq) else - if freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }'); then - true + if egrep -q -s -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo; then + freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%.1f", $2 / 1000 }') else # Must scale frequency by number of processors, if counting bogomips count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)