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: implement 'check' for a fs on top of LUKS

Browse Source
This commit is contained in:
Ondrej Kozina 2017-10-11 11:17:36 +02:00
parent c795a3b37f
commit f5beb58561
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/fsadm.sh
View File

@ -534,7 +534,7 @@ detect_luks_device() {
_LUKS_VERSION=$($CRYPTSETUP luksDump $VOLUME 2> /dev/null | $GREP "Version:")
if [ -z $_LUKS_VERSION ]; then
if [ -z "$_LUKS_VERSION" ]; then
verbose "Failed to parse LUKS version on volume \"$VOLUME\""
return
fi
@ -543,7 +543,7 @@ detect_luks_device() {
_LUKS_UUID=$($CRYPTSETUP luksDump $VOLUME 2> /dev/null | $GREP "UUID:")
if [ -z $_LUKS_UUID ]; then
if [ -z "$_LUKS_UUID" ]; then
verbose "Failed to parse LUKS UUID on volume \"$VOLUME\""
return
fi
@ -552,6 +552,11 @@ detect_luks_device() {
CRYPT_NAME=$(dmsetup info -c --noheadings -S "UUID=~^$_LUKS_UUID&&segments=1&&devnos_used='$MAJOR:$MINOR'" -o name)
test -z "$CRYPT_NAME" || CRYPT_DATA_OFFSET=$(dmsetup table $CRYPT_NAME | cut -d ' ' -f 8)
# LUKS device must be active and mapped over volume where detected
if [ -z "$CRYPT_NAME" -o -z "$CRYPT_DATA_OFFSET" ]; then
error "Can not find active LUKS device. Unlock \"$VOLUME\" volume first."
fi
}
######################################
@ -566,11 +571,6 @@ resize_luks() {
detect_luks_device
# LUKS device must be active and mapped over volume where detected
if [ -z "$CRYPT_NAME" -o -z "$CRYPT_DATA_OFFSET" ]; then
error "Can not find active LUKS device. Unlock \"$VOLUME\" volume first."
fi
NAME=$CRYPT_NAME
verbose "Found active LUKS device \"$NAME\" for volume \"$VOLUME\""
@ -682,6 +682,12 @@ diff_dates() {
echo $(( $("$DATE" -u -d"$1" +%s 2>"$NULL") - $("$DATE" -u -d"$2" +%s 2>"$NULL") ))
}
check_luks() {
detect_luks_device
check "$DM_DEV_DIR/mapper/$CRYPT_NAME"
}
###################
# Check filesystem
###################
@ -731,6 +737,9 @@ check() {
*i*) dry "$FSCK" $YES $FORCE "$VOLUME" ;;
*) dry "$FSCK" $FORCE -p "$VOLUME" ;;
esac ;;
"crypto_LUKS")
which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required."
check_luks ;;
*)
error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;
esac