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

tests: get.sh declare and assign separately

Browse Source 
Declare and assign separately to avoid masking return values.

Also comment-out currently unused  orig variable.
This commit is contained in:
Zdenek Kabelac 2017-06-29 10:26:28 +02:00
parent 834b82b0cd
commit 3d90c7fffc
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/lib/get.sh
View File

@ -28,32 +28,38 @@ trim_() {
}
pv_field() {
local r=$(pvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
local r
r=$(pvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
vg_field() {
local r=$(vgs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
local r
r=$(vgs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
lv_field() {
local r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
local r
r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
lv_first_seg_field() {
local r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1" | head -1)
local r
r=$(lvs --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1" | head -1)
trim_ "$r"
}
lvh_field() {
local r=$(lvs -H --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
local r
r=$(lvs -H --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
lva_field() {
local r=$(lvs -a --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
local r
r=$(lvs -a --config 'log{prefix=""}' --noheadings -o "$2" "${@:3}" "$1")
trim_ "$r"
}
@ -67,8 +73,10 @@ lv_field_lv_() {
lv_tree_devices_() {
local lv="$1/$2"
local type=$(lv_field "$lv" segtype -a --unbuffered | head -n 1)
local orig=$(lv_field_lv_ "$lv" origin)
local type
type=$(lv_field "$lv" segtype -a --unbuffered | head -n 1)
#local orig
#orig=$(lv_field_lv_ "$lv" origin)
# FIXME: should we count in also origins ?
#test -z "$orig" || lv_tree_devices_ $1 $orig
case "$type" in
@ -76,7 +84,8 @@ lv_tree_devices_() {
lv_devices "$lv"
;;
mirror|raid*)
local log=$(lv_field_lv_ "$lv" mirror_log)
local log
log=$(lv_field_lv_ "$lv" mirror_log)
test -z "$log" || lv_tree_devices_ "$1" "$log"
for i in $(lv_devices "$lv")
do lv_tree_devices_ "$1" "$i"; done