From 18d24bbb762ea0a4ab1b199c44bb58a2e9370db5 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Tue, 24 May 2011 22:24:48 -0500
Subject: [PATCH] usr/lib/byobu/disk_io: fix scaling, LP: #787773

---
 debian/changelog      |  1 +
 usr/lib/byobu/disk_io | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e221fa6e..4b03f6e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ byobu (4.3) unreleased; urgency=low
 
   * usr/lib/byobu/uptime: fix string bug in uptime introduced by smoser's
     changes
+  * usr/lib/byobu/disk_io: fix scaling, LP: #787773
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 23 May 2011 19:21:36 -0500
 
diff --git a/usr/lib/byobu/disk_io b/usr/lib/byobu/disk_io
index 7b368423..cd629ee0 100755
--- a/usr/lib/byobu/disk_io
+++ b/usr/lib/byobu/disk_io
@@ -73,15 +73,19 @@ for i in "read" "write"; do
 			x2="$a7"
 		fi
 		echo "$x2" > "$cache"
-		rate=$((($x2-$x1) / ($t2 - $t1) * 512 / 1024))
+		rate=$((($x2 - $x1) / ($t2 - $t1) * 512 / 1024))
 		if [ "$rate" -lt 0 ]; then
 			rate=0
 		elif [ "$rate" -gt 1048576 ]; then
-			fpdiv "$rate" 1048576 1
 			unit="GB/s"
+			fpdiv "$rate" 1048576 0
+			rate=${_RET}
 		elif [ "$rate" -gt 1024 ]; then
-			fpdiv "$rate" 1024 1
 			unit="MB/s"
+			fpdiv "$rate" 1024 0
+			rate=${_RET}
+		else
+			unit="kB/s"
 		fi
 	fi
 	[ "$rate" != "0" ] || continue