mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
Visually better align lines which are executed as a result of true
or false result of previous command.
This commit is contained in:
parent
7a7392e151
commit
c133a264b0
@ -129,9 +129,9 @@ vg_validate_pvlv_counts_()
|
||||
|
||||
lvs -a -o+devices $local_vg
|
||||
|
||||
check_vg_field_ $local_vg pv_count $num_pvs &&
|
||||
check_vg_field_ $local_vg lv_count $num_lvs &&
|
||||
check_vg_field_ $local_vg snap_count $num_snaps
|
||||
check_vg_field_ $local_vg pv_count $num_pvs && \
|
||||
check_vg_field_ $local_vg lv_count $num_lvs && \
|
||||
check_vg_field_ $local_vg snap_count $num_snaps
|
||||
}
|
||||
|
||||
dmsetup_has_dm_devdir_support_()
|
||||
|
@ -20,9 +20,9 @@ lvm pvmove --version|sed -n "1s/.*: *\([0-9][^ ]*\) .*/\1/p" > actual
|
||||
# ensure they are the same
|
||||
diff -u actual expected
|
||||
|
||||
mknod $DM_DEV_DIR/null c 1 3 ||
|
||||
mknod $DM_DEV_DIR/null c 1 3 || \
|
||||
error "Can't create nodes on filesystem"
|
||||
echo >$DM_DEV_DIR/null ||
|
||||
echo >$DM_DEV_DIR/null || \
|
||||
error "Filesystem for tests does not allow using device nodes (check nodev)"
|
||||
|
||||
# ensure we can create devices (uses dmsetup, etc)
|
||||
|
@ -33,8 +33,7 @@ lv_is_on_() {
|
||||
}
|
||||
|
||||
save_dev_sum_() {
|
||||
mkfs.ext3 $1 > /dev/null &&
|
||||
md5sum $1 > md5.$(basename $1)
|
||||
mkfs.ext3 $1 > /dev/null && md5sum $1 > md5.$(basename $1)
|
||||
}
|
||||
|
||||
check_dev_sum_() {
|
||||
@ -83,8 +82,8 @@ check_and_cleanup_lvs_() {
|
||||
lvs -a -o name $vg > out && ! grep ^pvmove out
|
||||
lvremove -ff $vg
|
||||
if ! dmsetup table|not grep $vg; then
|
||||
echo "ERROR: lvremove did leave some some mappings in DM behind!" &&
|
||||
return 1
|
||||
echo "ERROR: lvremove did leave some some mappings in DM behind!" && \
|
||||
return 1
|
||||
fi
|
||||
:
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user