From 40360a4264d40ccf7dd094e446307567839547e6 Mon Sep 17 00:00:00 2001 From: Naohiro Aota Date: Thu, 12 Aug 2021 00:12:26 +0900 Subject: [PATCH] common/rc: fix blocksize detection for btrfs Mkfs.btrfs's "-b" does not specify the block size but the file system size. Use "-s" to detect it instead. Signed-off-by: Naohiro Aota Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/rc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 4cb062e2..7b80820f 100644 --- a/common/rc +++ b/common/rc @@ -978,7 +978,10 @@ _scratch_mkfs_sized() xfs) def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-b ?size= ?+([0-9]+).*/\1/p'` ;; - ext2|ext3|ext4|ext4dev|udf|btrfs|reiser4|ocfs2|reiserfs) + btrfs) + def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-s ?+([0-9]+).*/\1/p'` + ;; + ext2|ext3|ext4|ext4dev|udf|reiser4|ocfs2|reiserfs) def_blksz=`echo $MKFS_OPTIONS | sed -rn 's/.*-b ?+([0-9]+).*/\1/p'` ;; jfs) -- 2.39.5