>From df1cc5dd89750a419b921e12599fab644a867f4d Mon Sep 17 00:00:00 2001 From: Dmitry Monakhov Date: Fri, 22 Aug 2014 17:05:14 +0400 Subject: [PATCH] common: _scratch_mkfs_sized inherent default block size from MKFS_OPTIONS Signed-off-by: Dmitry Monakhov --- common/rc | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/common/rc b/common/rc index 84fef35..3fcf0a1 100644 --- a/common/rc +++ b/common/rc @@ -582,8 +582,19 @@ _scratch_mkfs_sized() { fssize=$1 blocksize=$2 - [ -z "$blocksize" ] && blocksize=4096 + case $FSTYP in + xfs) + def_blksz=`echo $MKFS_OPTIONS|sed -rn 's/.*-b ?size= ?+([0-9]+).*/\1/p'` + ;; + ext2|ext3|ext4|ext4dev|udf|btrfs) + def_blksz=`echo $MKFS_OPTIONS| sed -rn 's/.*-b ?+([0-9]+).*/\1/p'` + ;; + esac + + [ -n "$def_blksz" ] && blocksize=$def_blksz + [ -z "$blocksize" ] && blocksize=4096 + re='^[0-9]+$' if ! [[ $fssize =~ $re ]] ; then _notrun "error: _scratch_mkfs_sized: fs size \"$fssize\" not an integer." -- 1.7.1