shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-04 09:18:36 +03:00
Code Releases Activity

fsadm: split local var dev

Browse Source 
Split defining of local variables from being them
assigned at the same time (lossing error code).
This commit is contained in:
Zdenek Kabelac 2017-06-28 16:02:13 +02:00
parent 439aaca3bc
commit 05a6d43476
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/fsadm.sh
View File

@ -229,8 +229,10 @@ detect_fs() {
# Check that passed mounted MAJOR:MINOR is not matching $MAJOR:MINOR of resized $VOLUME # Check that passed mounted MAJOR:MINOR is not matching $MAJOR:MINOR of resized $VOLUME
validate_mounted_major_minor() { validate_mounted_major_minor() {
test "$1" = "$MAJORMINOR" || { test "$1" = "$MAJORMINOR" || {
local REFNAME=$(dmsetup info -c -j "${1%%:*}" -m "${1##*:}" -o name --noheadings 2>/dev/null) local REFNAME
local CURNAME=$(dmsetup info -c -j "$MAJOR" -m "$MINOR" -o name --noheadings 2>/dev/null) 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." \ error "Cannot ${CHECK+CHECK}${RESIZE+RESIZE} device \"$VOLUME\" without umounting filesystem $MOUNTED first." \
"Mounted filesystem is using device $CURNAME, but referenced device is $REFNAME." \ "Mounted filesystem is using device $CURNAME, but referenced device is $REFNAME." \
"Filesystem utilities currently do not support renamed devices." "Filesystem utilities currently do not support renamed devices."
@ -243,10 +245,12 @@ validate_mounted_major_minor() {
# abort further command processing # abort further command processing
check_valid_mounted_device() { check_valid_mounted_device() {
local MOUNTEDMAJORMINOR local MOUNTEDMAJORMINOR
local VOL=$("$READLINK" $READLINK_E "$1") local VOL
local CURNAME=$(dmsetup info -c -j "$MAJOR" -m "$MINOR" -o name --noheadings) local CURNAME
local SUGGEST="Possibly device \"$1\" has been renamed to \"$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.... # more confused, device is not DM....
test -n "$CURNAME" || SUGGEST="Mounted volume is not a device mapper device???" test -n "$CURNAME" || SUGGEST="Mounted volume is not a device mapper device???"