shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

fsadm: handle fsck return 1 for corrected fs

Browse Source
This commit is contained in:
Zdenek Kabelac 2020-10-24 00:42:31 +02:00
parent 73ef86ae3f
commit 51a532719c
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/fsadm.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2007-2017 Red Hat, Inc. All rights reserved.
# Copyright (C) 2007-2020 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@ -130,7 +130,15 @@ dry() {
return 0
fi
verbose "Executing" "$@"
"$@"
$@
}
# Accept as succss also return code 1 with fsck
accept_0_1() {
$@
local ret="$?"
test "$ret" -eq 1 || return "$ret"
# Filesystem was corrected
}
cleanup() {
@ -455,9 +463,10 @@ resize_ext() {
if test -n "$MOUNTED" ; then
# Forced fsck -f for umounted extX filesystem.
case "$-" in
*i*) dry "$FSCK" $YES -f "$VOLUME" ;;
*) dry "$FSCK" -f -p "$VOLUME" ;;
*i*) FLAG=$YES ;;
*) FLAG="-p" ;;
esac
accept_0_1 dry "$FSCK" -f $FLAG "$VOLUME" || error "Failed to fsck $VOLUME"
fi
fi
@ -742,9 +751,11 @@ check() {
"ext2"|"ext3"|"ext4"|"reiserfs")
# check if executed from interactive shell environment
case "$-" in
*i*) dry "$FSCK" $YES $FORCE "$VOLUME" ;;
*) dry "$FSCK" $FORCE -p "$VOLUME" ;;
esac ;;
*i*) FLAG=$YES ;;
*) FLAG="-p" ;;
esac
accept_0_1 dry "$FSCK" $FORCE $FLAG "$VOLUME" || error "Fsck $FSTYPE failed."
;;
"crypto_LUKS")
which "$CRYPTSETUP" >"$NULL" 2>&1 || error "$CRYPTSETUP utility required."
check_luks ;;