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

fsadm: avoid using -a in test

Browse Source
This commit is contained in:
Zdenek Kabelac 2014-06-30 20:03:05 +02:00
parent 7bdf4719e8
commit 6f6900d457
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/fsadm.sh
View File

@ -276,7 +276,7 @@ try_umount() {
} }
validate_parsing() { validate_parsing() {
test -n "$BLOCKSIZE" -a -n "$BLOCKCOUNT" || error "Cannot parse $1 output" test -n "$BLOCKSIZE" && test -n "$BLOCKCOUNT" || error "Cannot parse $1 output"
} }
#################################### ####################################
# Resize ext2/ext3/ext4 filesystem # Resize ext2/ext3/ext4 filesystem
@ -459,12 +459,12 @@ trap "cleanup 2" 2
test -n "$FSADM_RUNNING" && exit 0 test -n "$FSADM_RUNNING" && exit 0
# test some prerequisities # test some prerequisities
test -n "$TUNE_EXT" -a -n "$RESIZE_EXT" -a -n "$TUNE_REISER" -a -n "$RESIZE_REISER" \ for i in "$TUNE_EXT" "$RESIZE_EXT" "$TUNE_REISER" "$RESIZE_REISER" \
-a -n "$TUNE_XFS" -a -n "$RESIZE_XFS" -a -n "$MOUNT" -a -n "$UMOUNT" -a -n "$MKDIR" \ "$TUNE_XFS" "$RESIZE_XFS" "$MOUNT" "$UMOUNT" "$MKDIR" \
-a -n "$RMDIR" -a -n "$BLOCKDEV" -a -n "$BLKID" -a -n "$GREP" -a -n "$READLINK" \ "$RMDIR" "$BLOCKDEV" "$BLKID" "$GREP" "$READLINK" \
-a -n "$DATE" -a -n "$FSCK" -a -n "$XFS_CHECK" -a -n "$XFS_REPAIR" \ "$DATE" "$FSCK" "$XFS_CHECK" "$XFS_REPAIR" "$LVM" ; do
-a -n "$LVM" \ test -n "$i" || error "Required command definitions in the script are missing!"
|| error "Required command definitions in the script are missing!" done
"$LVM" version >"$NULL" 2>&1 || error "Could not run lvm binary \"$LVM\"" "$LVM" version >"$NULL" 2>&1 || error "Could not run lvm binary \"$LVM\""
$("$READLINK" -e / >"$NULL" 2>&1) || READLINK_E="-f" $("$READLINK" -e / >"$NULL" 2>&1) || READLINK_E="-f"