From: Zdenek Kabelac <zkabelac@redhat.com> Date: Sun, 25 Oct 2020 19:19:31 +0000 (+0100) Subject: fsadm: better check for getsize64 support X-Git-Tag: v2_03_11~31 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=b0333841352b76ce13464b82cb1876ea82b80351;p=lvm2.git fsadm: better check for getsize64 support Older blockdev tool return failure error code with --help, and since now the tool abort on command failure, lets detect missing --getsize64 support directly by running command and check if it returns something usable. It's likely very hard to have the system with such old blockdev tool and newer lvm2 compiled. --- diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh index 5bba5ff40..9b95d318d 100755 --- a/scripts/fsadm.sh +++ b/scripts/fsadm.sh @@ -377,16 +377,13 @@ detect_mounted() { # get the full size of device in bytes detect_device_size() { # check if blockdev supports getsize64 - "$BLOCKDEV" --help 2>&1 | "$GREP" getsize64 >"$NULL" - if test $? -eq 0; then - DEVSIZE=$("$BLOCKDEV" --getsize64 "$VOLUME") + DEVSIZE=$("$BLOCKDEV" --getsize64 "$VOLUME" 2>"$NULL" || true) + if test -n "$DEVSIZE" ; then + DEVSIZE=$("$BLOCKDEV" --getsize "$VOLUME" || true) test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"." - else - DEVSIZE=$("$BLOCKDEV" --getsize "$VOLUME") - test -n "$DEVSIZE" || error "Cannot read size of device \"$VOLUME\"." - SSSIZE=$("$BLOCKDEV" --getss "$VOLUME") + SSSIZE=$("$BLOCKDEV" --getss "$VOLUME" || true) test -n "$SSSIZE" || error "Cannot read sector size of device \"$VOLUME\"." - DEVSIZE=$(("$DEVSIZE" * "$SSSIZE")) + DEVSIZE=$(( $DEVSIZE * $SSSIZE )) fi }