diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2017-06-28 16:02:13 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2017-06-29 22:23:16 +0200 |
| commit | 05a6d43476a4b2600329eae444c980107494b4ac (patch) | |
| tree | c0901ed2bda0d56eddd1ba1aa7b3f53cb8c451d7 /scripts/fsadm.sh | |
| parent | 439aaca3bc42c73ffe99bbf9b15c726b987ee2a6 (diff) | |
| download | lvm2-05a6d43476a4b2600329eae444c980107494b4ac.tar.gz | |
fsadm: split local var dev
Split defining of local variables from being them
assigned at the same time (lossing error code).
Diffstat (limited to 'scripts/fsadm.sh')
| -rwxr-xr-x | scripts/fsadm.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh index f3cc98bcf..b8744b1cf 100755 --- a/scripts/fsadm.sh +++ b/scripts/fsadm.sh @@ -229,8 +229,10 @@ detect_fs() { # Check that passed mounted MAJOR:MINOR is not matching $MAJOR:MINOR of resized $VOLUME validate_mounted_major_minor() { test "$1" = "$MAJORMINOR" || { - local REFNAME=$(dmsetup info -c -j "${1%%:*}" -m "${1##*:}" -o name --noheadings 2>/dev/null) - local CURNAME=$(dmsetup info -c -j "$MAJOR" -m "$MINOR" -o name --noheadings 2>/dev/null) + local REFNAME + local CURNAME + REFNAME=$(dmsetup info -c -j "${1%%:*}" -m "${1##*:}" -o name --noheadings 2>/dev/null) + CURNAME=$(dmsetup info -c -j "$MAJOR" -m "$MINOR" -o name --noheadings 2>/dev/null) error "Cannot ${CHECK+CHECK}${RESIZE+RESIZE} device \"$VOLUME\" without umounting filesystem $MOUNTED first." \ "Mounted filesystem is using device $CURNAME, but referenced device is $REFNAME." \ "Filesystem utilities currently do not support renamed devices." @@ -243,10 +245,12 @@ validate_mounted_major_minor() { # abort further command processing check_valid_mounted_device() { local MOUNTEDMAJORMINOR - local VOL=$("$READLINK" $READLINK_E "$1") - local CURNAME=$(dmsetup info -c -j "$MAJOR" -m "$MINOR" -o name --noheadings) + local VOL + local CURNAME local SUGGEST="Possibly device \"$1\" has been renamed to \"$CURNAME\"?" + VOL=$("$READLINK" $READLINK_E "$1") + CURNAME=$(dmsetup info -c -j "$MAJOR" -m "$MINOR" -o name --noheadings) # more confused, device is not DM.... test -n "$CURNAME" || SUGGEST="Mounted volume is not a device mapper device???" |