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: fix test of subshell return value

Browse Source 
Subshell is not returning error code value upward thus
error results in this case were actually ignored.
Also add dots to moved error messages.
This commit is contained in:
Zdenek Kabelac 2017-05-09 20:52:15 +02:00
parent 455a4de090
commit 1107d483a2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.172 - Version 2.02.172 -
=============================== ===============================
Properly handle subshell return codes in fsadm.
Disallow cachepool creation with policy cleaner and mode writeback. Disallow cachepool creation with policy cleaner and mode writeback.
Version 2.02.171 - 3rd May 2017 Version 2.02.171 - 3rd May 2017

18
scripts/fsadm.sh
View File

@ -183,7 +183,8 @@ decode_size() {
detect_fs() { detect_fs() {
VOLUME_ORIG=$1 VOLUME_ORIG=$1
VOLUME=${1/#"${DM_DEV_DIR}/"/} VOLUME=${1/#"${DM_DEV_DIR}/"/}
VOLUME=$("$READLINK" $READLINK_E "$DM_DEV_DIR/$VOLUME") || error "Cannot get readlink \"$1\"" VOLUME=$("$READLINK" $READLINK_E "$DM_DEV_DIR/$VOLUME")
test -n "$VOLUME" || error "Cannot get readlink \"$1\"."
RVOLUME=$VOLUME RVOLUME=$VOLUME
case "$RVOLUME" in case "$RVOLUME" in
# hardcoded /dev since udev does not create these entries elsewhere # hardcoded /dev since udev does not create these entries elsewhere
@ -192,7 +193,8 @@ detect_fs() {
read </sys/block/${RVOLUME#/dev/}/dev MAJORMINOR 2>&1 || error "Cannot get major:minor for \"$VOLUME\"" read </sys/block/${RVOLUME#/dev/}/dev MAJORMINOR 2>&1 || error "Cannot get major:minor for \"$VOLUME\""
;; ;;
*) *)
STAT=$(stat --format "MAJOR=%t MINOR=%T" ${RVOLUME}) || error "Cannot get major:minor for \"$VOLUME\"" STAT=$(stat --format "MAJOR=%t MINOR=%T" ${RVOLUME})
test -n "$STAT" || error "Cannot get major:minor for \"$VOLUME\"."
eval $STAT eval $STAT
MAJOR=$((0x${MAJOR})) MAJOR=$((0x${MAJOR}))
MINOR=$((0x${MINOR})) MINOR=$((0x${MINOR}))
@ -201,7 +203,8 @@ detect_fs() {
esac esac
# use null device as cache file to be sure about the result # use null device as cache file to be sure about the result
# not using option '-o value' to be compatible with older version of blkid # not using option '-o value' to be compatible with older version of blkid
FSTYPE=$("$BLKID" -c "$NULL" -s TYPE "$VOLUME") || error "Cannot get FSTYPE of \"$VOLUME\"" FSTYPE=$("$BLKID" -c "$NULL" -s TYPE "$VOLUME")
test -n "$FSTYPE" || error "Cannot get FSTYPE of \"$VOLUME\"."
FSTYPE=${FSTYPE##*TYPE=\"} # cut quotation marks FSTYPE=${FSTYPE##*TYPE=\"} # cut quotation marks
FSTYPE=${FSTYPE%%\"*} FSTYPE=${FSTYPE%%\"*}
verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\"" verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\""
@ -257,10 +260,13 @@ detect_device_size() {
# check if blockdev supports getsize64 # check if blockdev supports getsize64
"$BLOCKDEV" 2>&1 | "$GREP" getsize64 >"$NULL" "$BLOCKDEV" 2>&1 | "$GREP" getsize64 >"$NULL"
if test $? -eq 0; then if test $? -eq 0; then
DEVSIZE=$("$BLOCKDEV" --getsize64 "$VOLUME") || error "Cannot read size of device \"$VOLUME\"" DEVSIZE=$("$BLOCKDEV" --getsize64 "$VOLUME")
test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"."
else else
DEVSIZE=$("$BLOCKDEV" --getsize "$VOLUME") || error "Cannot read size of device \"$VOLUME\"" DEVSIZE=$("$BLOCKDEV" --getsize "$VOLUME")
SSSIZE=$("$BLOCKDEV" --getss "$VOLUME") || error "Cannot block size read device \"$VOLUME\"" test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"."
SSSIZE=$("$BLOCKDEV" --getss "$VOLUME")
test -n "$SSSIZE" || error "Cannot read sector size of device \"$VOLUME\"."
DEVSIZE=$(($DEVSIZE * $SSSIZE)) DEVSIZE=$(($DEVSIZE * $SSSIZE))
fi fi
} }