summaryrefslogtreecommitdiffstats
path: root/tests/ts/blkid
diff options
context:
space:
mode:
authorKarel Zak2016-10-26 10:22:40 +0200
committerKarel Zak2016-10-26 10:22:40 +0200
commitc95cad20985376cd62f7ed2ed8943940e1773a07 (patch)
tree15e03a2515c3de4250165ff7a5faf4c1d920d322 /tests/ts/blkid
parentmisc: fix unsigned int usage for ctype.h functions (diff)
parenttest: fix raid1 minimum I/O size (diff)
downloadkernel-qcow2-util-linux-c95cad20985376cd62f7ed2ed8943940e1773a07.tar.gz
kernel-qcow2-util-linux-c95cad20985376cd62f7ed2ed8943940e1773a07.tar.xz
kernel-qcow2-util-linux-c95cad20985376cd62f7ed2ed8943940e1773a07.zip
Merge branch 'tests-raid1' of https://github.com/rudimeier/util-linux
Diffstat (limited to 'tests/ts/blkid')
-rwxr-xr-xtests/ts/blkid/md-raid1-whole2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 76ff8f838..050adecd7 100755
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -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