]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
test: fix raid1 minimum I/O size
authorRuediger Meier <ruediger.meier@ga-group.nl>
Fri, 21 Oct 2016 14:19:29 +0000 (16:19 +0200)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Fri, 21 Oct 2016 14:37:58 +0000 (16:37 +0200)
Seems this has been changed in kernels >4.4.x or >4.8
from 512 bytes to 64K.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
tests/expected/blkid/md-raid1-whole
tests/ts/blkid/md-raid1-whole

index d715f3933e9ef84b7729901da1a1a5693e4c46df..ae5a95ddbb6c34f28d7a1301f0bc4e53f434025a 100644 (file)
@@ -24,7 +24,7 @@ Created a new <removed>.
 Command (m for help): Disk /dev/md8: 50 MiB, 52363264 bytes, 102272 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
-I/O size (minimum/optimal): 512 bytes / <removed> bytes
+I/O size (minimum/optimal): <removed> bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
index 76ff8f83893820f1161fe094c0a2a4cf015c711e..050adecd7adb571f4b3bec934407d6d0228f1f44 100755 (executable)
@@ -80,6 +80,8 @@ udevadm settle
 ts_log "Deinitialize devices"
 
 ts_fdisk_clean
+# seems that raid1 minimum I/O size has been changed in kernels >4.4.x and >4.8
+sed -i 's@^\(I/O size (minimum/optimal): \)[1-9][0-9]*@\1<removed>@' $TS_OUTPUT
 # remove generated UUIDs
 sed -i -e 's/ID_FS_UUID.*//g' $TS_OUTPUT