diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-01-18 17:22:10 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-01-18 17:34:26 +0000 |
| commit | 40f2132aa6410455c11faf417f8031b51c5600cb (patch) | |
| tree | be2174cc29db8f2cc4e4329a168df0d801095bb9 /scripts | |
| parent | 8b60f7fe9e0c57612a8f22bb975e7466a80331e8 (diff) | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/functions | 8 |
1 files changed, 5 insertions, 3 deletions
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 |