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

shellcheck: fsadm cleanup

Browse Source 
Use some more "" for bash vars
This commit is contained in:
Zdenek Kabelac 2017-11-05 18:22:02 +01:00
parent 0f0baec1f3
commit d45a9c0f5b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/fsadm.sh
View File

@ -532,7 +532,7 @@ detect_luks_device() {
CRYPT_NAME="" CRYPT_NAME=""
CRYPT_DATA_OFFSET="" CRYPT_DATA_OFFSET=""
_LUKS_VERSION=$($CRYPTSETUP luksDump $VOLUME 2> /dev/null | $GREP "Version:") _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\"" verbose "Failed to parse LUKS version on volume \"$VOLUME\""
@ -541,7 +541,7 @@ detect_luks_device() {
_LUKS_VERSION=${_LUKS_VERSION//[Version:[:space:]]/} _LUKS_VERSION=${_LUKS_VERSION//[Version:[:space:]]/}
_LUKS_UUID=$($CRYPTSETUP luksDump $VOLUME 2> /dev/null | $GREP "UUID:") _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\"" verbose "Failed to parse LUKS UUID on volume \"$VOLUME\""
@ -551,10 +551,10 @@ detect_luks_device() {
_LUKS_UUID="CRYPT-LUKS$_LUKS_VERSION-${_LUKS_UUID//[UID:[:space:]-]/}-" _LUKS_UUID="CRYPT-LUKS$_LUKS_VERSION-${_LUKS_UUID//[UID:[:space:]-]/}-"
CRYPT_NAME=$(dmsetup info -c --noheadings -S "UUID=~^$_LUKS_UUID&&segments=1&&devnos_used='$MAJOR:$MINOR'" -o name) 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) 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 # LUKS device must be active and mapped over volume where detected
if [ -z "$CRYPT_NAME" -o -z "$CRYPT_DATA_OFFSET" ]; then if [ -z "$CRYPT_NAME" ] || [ -z "$CRYPT_DATA_OFFSET" ]; then
error "Can not find active LUKS device. Unlock \"$VOLUME\" volume first." error "Can not find active LUKS device. Unlock \"$VOLUME\" volume first."
fi fi
} }
@ -599,7 +599,7 @@ resize_luks() {
fi fi
# resize LUKS device # resize LUKS device
dry $CRYPTSETUP resize $NAME --size $L_NEWBLOCKCOUNT || error "Failed to resize active LUKS device" dry "$CRYPTSETUP" resize "$NAME" --size $L_NEWBLOCKCOUNT || error "Failed to resize active LUKS device"
if [ $SHRINK -eq 0 ]; then if [ $SHRINK -eq 0 ]; then
# grow fs on top of LUKS device # grow fs on top of LUKS device
@ -612,9 +612,9 @@ detect_crypt_device() {
local L_NEWSIZE local L_NEWSIZE
local TMP local TMP
which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize crypt device" which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize crypt device"
CRYPT_TYPE=$($CRYPTSETUP status $1 2> /dev/null | $GREP "type:") CRYPT_TYPE=$("$CRYPTSETUP" status "$1" 2> /dev/null | "$GREP" "type:")
test -n "$CRYPT_TYPE" || error "$CRYPTSETUP failed to detect device type on $1." test -n "$CRYPT_TYPE" || error "$CRYPTSETUP failed to detect device type on $1."
@ -651,7 +651,7 @@ detect_crypt_device() {
# (on direct user request only) # (on direct user request only)
################################# #################################
resize_crypt() { resize_crypt() {
dry $CRYPTSETUP resize "$1" --size $CRYPT_RESIZE_BLOCKS || error "$CRYPTSETUP failed to resize device $1" dry "$CRYPTSETUP" resize "$1" --size $CRYPT_RESIZE_BLOCKS || error "$CRYPTSETUP failed to resize device $1"
} }
#################### ####################
@ -674,7 +674,7 @@ resize() {
"reiserfs") resize_reiser $NEWSIZE ;; "reiserfs") resize_reiser $NEWSIZE ;;
"xfs") resize_xfs $NEWSIZE ;; "xfs") resize_xfs $NEWSIZE ;;
"crypto_LUKS") "crypto_LUKS")
which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume" which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume"
resize_luks $NEWSIZE ;; resize_luks $NEWSIZE ;;
*) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; *) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;
esac || error "Resize $FSTYPE failed." esac || error "Resize $FSTYPE failed."
@ -746,7 +746,7 @@ check() {
*) dry "$FSCK" $FORCE -p "$VOLUME" ;; *) dry "$FSCK" $FORCE -p "$VOLUME" ;;
esac ;; esac ;;
"crypto_LUKS") "crypto_LUKS")
which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required." which "$CRYPTSETUP" > /dev/null 2>&1 || error "$CRYPTSETUP utility required."
check_luks ;; check_luks ;;
*) *)
error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;;