mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
tests: replace legacy code
Use $(..) instead of legacy `..`.
This commit is contained in:
parent
d606891e4a
commit
38917ee51c
@ -33,7 +33,7 @@ dmsetup remove GL_DEV || true
|
||||
rm -f "$GL_FILE"
|
||||
dd if=/dev/zero of="$GL_FILE" bs=$((1024*1024)) count=1024 2> /dev/null
|
||||
GL_LOOP=$(losetup -f "$GL_FILE" --show)
|
||||
echo "0 `blockdev --getsize $GL_LOOP` linear $GL_LOOP 0" | dmsetup create GL_DEV
|
||||
echo "0 $(blockdev --getsize $GL_LOOP linear $GL_LOOP 0)" | dmsetup create GL_DEV
|
||||
|
||||
aux prepare_sanlock
|
||||
aux prepare_lvmlockd
|
||||
|
@ -17,7 +17,7 @@ SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
flatten() {
|
||||
cat > flatten.config
|
||||
for s in `egrep '^[a-z]+ {$' flatten.config | sed -e s,{$,,`; do
|
||||
for s in $(grep -E '^[a-z]+ {$' flatten.config | sed -e 's,{$,,'); do
|
||||
sed -e "/^$s/,/^}/p;d" flatten.config | sed -e '1d;$d' | sed -e "s,^[ \t]*,$s/,";
|
||||
done
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ function check_sub_lvs
|
||||
local lv=$2
|
||||
local end=$3
|
||||
|
||||
for s in `seq 0 $end`
|
||||
for s in $(seq 0 "$end")
|
||||
do
|
||||
check lv_exists $vg ${lv}_rmeta_$s
|
||||
check lv_exists $vg ${lv}_rimage_$s
|
||||
@ -39,7 +39,7 @@ function check_no_sub_lvs
|
||||
local start=$3
|
||||
local end=$4
|
||||
|
||||
for s in `seq $start $end`
|
||||
for s in $(seq "$start" "$end")
|
||||
do
|
||||
check lv_not_exists $vg ${lv}_rmeta_$s
|
||||
check lv_not_exists $vg ${lv}_rimage_$s
|
||||
|
@ -23,7 +23,7 @@ get_image_pvs() {
|
||||
local d
|
||||
local images
|
||||
|
||||
images=`dmsetup ls | grep ${1}-${2}_.image_.* | cut -f1 | sed -e s:-:/:`
|
||||
images=$(dmsetup ls | grep "${1}-${2}_.image_.*" | cut -f1 | sed -e s:-:/:)
|
||||
lvs --noheadings -a -o devices "$images" | sed s/\(.\)//
|
||||
}
|
||||
|
||||
@ -162,7 +162,7 @@ lvconvert --splitmirrors 1 --trackchanges $vg/$lv1
|
||||
check lv_exists $vg $lv1
|
||||
check linear $vg ${lv1}_rimage_2
|
||||
fsck.ext4 -fn "$DM_DEV_DIR/mapper/$vg-${lv1}_rimage_2"
|
||||
dd of="$DM_DEV_DIR/$vg/$lv1" if=/dev/zero bs=512 oflag=direct count=`blockdev --getsz "$DM_DEV_DIR/$vg/$lv1"`
|
||||
dd of="$DM_DEV_DIR/$vg/$lv1" if=/dev/zero bs=512 oflag=direct count="$(blockdev --getsz "$DM_DEV_DIR/$vg/$lv1")"
|
||||
not fsck.ext4 -fn "$DM_DEV_DIR/$vg/$lv1"
|
||||
fsck.ext4 -fn "$DM_DEV_DIR/mapper/$vg-${lv1}_rimage_2"
|
||||
# FIXME: needed on tiny loop but not on real block backend ?
|
||||
|
@ -19,7 +19,7 @@ get_image_pvs() {
|
||||
local d
|
||||
local images
|
||||
|
||||
images=`dmsetup ls | grep ${1}-${2}_.image_.* | cut -f1 | sed -e s:-:/:`
|
||||
images=$(dmsetup ls | grep "${1}-${2}_.image_.*" | cut -f1 | sed -e s:-:/:)
|
||||
lvs --noheadings -a -o devices $images | sed s/\(.\)//
|
||||
}
|
||||
|
||||
|
@ -19,7 +19,7 @@ get_image_pvs() {
|
||||
local d
|
||||
local images
|
||||
|
||||
images=`dmsetup ls | grep ${1}-${2}_.image_.* | cut -f1 | sed -e s:-:/:`
|
||||
images=$(dmsetup ls | grep "${1}-${2}_.image_.*" | cut -f1 | sed -e s:-:/:)
|
||||
lvs --noheadings -a -o devices $images | sed s/\(.\)//
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user