From f6efb9eb0ccb110054ee000188a15b8f6b48ba18 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sun, 24 Jun 2012 13:39:41 -0500 Subject: [PATCH] * usr/lib/byobu/raid: LP: #1006971 - ensure raid status cache gets cleared out when done rebuilding --- debian/changelog | 2 ++ usr/lib/byobu/raid | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a244c086..a55bf299 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ byobu (5.20) unreleased; urgency=low - drop run-one usage, use flock directly instead * debian/control, usr/share/byobu/windows/common: - fix some lintian warnings and errors + * usr/lib/byobu/raid: LP: #1006971 + - ensure raid status cache gets cleared out when done rebuilding -- Dustin Kirkland Fri, 08 Jun 2012 17:25:23 -0500 diff --git a/usr/lib/byobu/raid b/usr/lib/byobu/raid index a73aac13..ab575abd 100755 --- a/usr/lib/byobu/raid +++ b/usr/lib/byobu/raid @@ -29,15 +29,21 @@ __raid() { # Errors in your raid case "$line" in *\ blocks\ *\[*_*\]$) - [ -z "${msg}" ] && msg="RAID";; + [ -z "${msg}" ] && msg="RAID" + ;; *%*) p="${line%%\%*}${PCT}"; p=${p##* }; [ -z "$msg" ] && msg="RAID" - msg="$msg,$p";; + msg="$msg,$p" + ;; esac done < /proc/mdstat - [ -n "$msg" ] || return - color B w r; printf "%s" "$msg"; color -- + if [ -n "$msg" ]; then + color B w r; printf "%s" "$msg"; color -- + elif [ -e "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/raid" ]; then + # Clear out cached raid message + rm -f "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/raid"* + fi } # vi: syntax=sh ts=4 noexpandtab