From 40f2132aa6410455c11faf417f8031b51c5600cb Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 18 Jan 2016 17:22:10 +0000
Subject: scripts/functions: Fix fsck display options

- Enable spinner (-C) when not debugging
- Test ${quiet}, not ${VERBOSE} as used in initscripts
- Suppress fsck title message (-T) when quiet

Closes: #781239
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/functions | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/functions b/scripts/functions
index 499a430..930a12c 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -352,10 +352,12 @@ _checkfs_once()
 		fix="-a"
 	fi
 
-	# spinner="-C" -- only if on an interactive terminal
 	spinner=""
+	if [ -z "${debug}" ]; then
+		spinner="-C"
+	fi
 
-	if [ "$VERBOSE" = no ]
+	if [ "${quiet}" = n ]
 	then
 		log_begin_msg "Will now check $NAME file system"
 		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -V -t $TYPE $DEV
@@ -363,7 +365,7 @@ _checkfs_once()
 		log_end_msg
 	else
 		log_begin_msg "Checking $NAME file system"
-		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -t $TYPE $DEV
+		logsave -a -s $FSCK_LOGFILE fsck $spinner $force $fix -T -t $TYPE $DEV
 		FSCKCODE=$?
 		log_end_msg
 	fi
-- 
cgit v1.2.3