From d73ea2ae2ecf6107a2571a8eeaa4b518c49314a3 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Tue, 19 Apr 2011 16:32:53 -0400 Subject: [PATCH] usr/lib/byobu/disk_io: conditionally use readlink -f, LP: #764584 --- debian/changelog | 1 + usr/lib/byobu/disk_io | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bad62b9c..65806e1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ byobu (3.33) unreleased; urgency=low * usr/bin/byobu-launch: make sure this finishes with a true + * usr/lib/byobu/disk_io: conditionally use readlink -f, LP: #764584 -- Dustin Kirkland Sun, 17 Apr 2011 13:30:34 -0500 diff --git a/usr/lib/byobu/disk_io b/usr/lib/byobu/disk_io index a20d49a9..f1c022b3 100755 --- a/usr/lib/byobu/disk_io +++ b/usr/lib/byobu/disk_io @@ -29,7 +29,8 @@ case $MP in /dev/*) disk="$MP" ;; *) disk=$(grep -m 1 " $MP " /etc/mtab | sed -e "s: .*$::") ;; esac -disk=$(readlink "$disk" | sed -e "s: .*$::" -e "s:^.*/::" -e "s:\([hsv]d[a-z]\)[0-9]*$:\1:") +which greadlink 2>/dev/null && READLINK="greadlink" || READLINK="readlink" +disk=$($READLINK -f "$disk" | sed -e "s: .*$::" -e "s:^.*/::" -e "s:\([hsv]d[a-z]\)[0-9]*$:\1:") if [ "$1" = "--detail" ]; then if which iostat >/dev/null; then