remove mkfs command from imagefile_make()

The nuance is that the file system is created taking into account the block size of the block device. Previously, the file system was created for a regular file. When creating a block device with a block size of 4KiB, such a whole could not be mounted.
veeam · Nov 24, 2023 · 96292a1 · 96292a1
1 parent 9c2fbd3
commit 96292a1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 2 deletions.
diff --git a/tests/1000-simple.sh b/tests/1000-simple.sh
@@ -39,6 +39,7 @@ IMAGEFILE_1=${TESTDIR}/simple_1.img
 imagefile_make ${IMAGEFILE_1} 64
 
 DEVICE_1=$(loop_device_attach ${IMAGEFILE_1} ${BLOCK_SIZE})
+mkfs.ext4 ${DEVICE_1}
 echo "new device ${DEVICE_1}"
 
 MOUNTPOINT_1=${MPDIR}/simple_1
@@ -50,6 +51,7 @@ IMAGEFILE_2=${TESTDIR}/simple_2.img
 imagefile_make ${IMAGEFILE_2} 128
 
 DEVICE_2=$(loop_device_attach ${IMAGEFILE_2} ${BLOCK_SIZE})
+mkfs.ext4 ${DEVICE_2}
 echo "new device ${DEVICE_2}"
 
 MOUNTPOINT_2=${MPDIR}/simple_2

diff --git a/tests/1100-loop_diff_storage.sh b/tests/1100-loop_diff_storage.sh
@@ -24,7 +24,7 @@ MPDIR=/mnt/blksnap-test
 rm -rf ${MPDIR}
 mkdir -p ${MPDIR}
 
-# create first device
+# create difference storage device
 DIFF_STOGAGE_FILE=${TESTDIR}/diff_storage.img
 imagefile_make ${DIFF_STOGAGE_FILE} ${BLk_SZ}
 
@@ -36,6 +36,7 @@ IMAGEFILE_1=${TESTDIR}/simple_1.img
 imagefile_make ${IMAGEFILE_1} ${BLk_SZ}
 
 DEVICE_1=$(loop_device_attach ${IMAGEFILE_1})
+mkfs.ext4 ${DEVICE_1}
 echo "new device ${DEVICE_1}"
 
 MOUNTPOINT_1=${MPDIR}/simple_1

diff --git a/tests/1200-tmpfs_diff_storage.sh b/tests/1200-tmpfs_diff_storage.sh
@@ -43,6 +43,7 @@ IMAGEFILE_1=${TESTDIR}/simple_1.img
 imagefile_make ${IMAGEFILE_1} ${BLK_SZ}
 
 DEVICE_1=$(loop_device_attach ${IMAGEFILE_1})
+mkfs.ext4 ${DEVICE_1}
 echo "new device ${DEVICE_1}"
 
 MOUNTPOINT_1=${MPDIR}/simple_1

diff --git a/tests/1300-tmpfile_diff_storage.sh b/tests/1300-tmpfile_diff_storage.sh
@@ -17,6 +17,7 @@ BLOCK_SIZE=$(block_size_mnt ${DIFF_STORAGE_DIR})
 
 echo "---"
 echo "Simple test start"
+echo "devices block size ${BLOCK_SIZE}"
 
 blksnap_load
 
@@ -36,6 +37,7 @@ IMAGEFILE_1=${TESTDIR}/simple_1.img
 imagefile_make ${IMAGEFILE_1} 64
 
 DEVICE_1=$(loop_device_attach ${IMAGEFILE_1} ${BLOCK_SIZE})
+mkfs.ext4 ${DEVICE_1}
 echo "new device ${DEVICE_1}"
 
 MOUNTPOINT_1=${MPDIR}/simple_1

diff --git a/tests/2000-stretch.sh b/tests/2000-stretch.sh
@@ -36,6 +36,7 @@ IMAGEFILE_1=${TESTDIR}/simple_1.img
 imagefile_make ${IMAGEFILE_1} 4096
 
 DEVICE_1=$(loop_device_attach ${IMAGEFILE_1} ${BLOCK_SIZE})
+mkfs.ext4 ${DEVICE_1}
 echo "new device ${DEVICE_1}"
 
 MOUNTPOINT_1=${MPDIR}/simple_1

diff --git a/tests/3000-cbt.sh b/tests/3000-cbt.sh
@@ -36,6 +36,7 @@ IMAGEFILE_1=${TESTDIR}/simple_1.img
 imagefile_make ${IMAGEFILE_1} 4096
 
 DEVICE_1=$(loop_device_attach ${IMAGEFILE_1} ${BLOCK_SIZE})
+mkfs.ext4 ${DEVICE_1}
 echo "new device ${DEVICE_1}"
 
 MOUNTPOINT_1=${MPDIR}/simple_1

diff --git a/tests/7000-destroy.sh b/tests/7000-destroy.sh
@@ -37,6 +37,7 @@ IMAGEFILE_1=${TESTDIR}/simple_1.img
 imagefile_make ${IMAGEFILE_1} 128
 
 DEVICE_1=$(loop_device_attach ${IMAGEFILE_1} ${BLOCK_SIZE})
+mkfs.ext4 ${DEVICE_1}
 echo "new device ${DEVICE_1}"
 
 MOUNTPOINT_1=${MPDIR}/simple_1

diff --git a/tests/functions.sh b/tests/functions.sh
@@ -8,7 +8,6 @@ imagefile_make()
 	local SIZE=$2
 
 	dd if=/dev/zero of=${FILEPATH} count=${SIZE} bs=1M status=none
-	mkfs.ext4 ${FILEPATH}
 	echo "new image file ${FILEPATH}"
 }