diff options
| author | Ruediger Meier <ruediger.meier@ga-group.nl> | 2016-10-21 16:19:29 +0200 |
|---|---|---|
| committer | Ruediger Meier <ruediger.meier@ga-group.nl> | 2016-10-21 16:37:58 +0200 |
| commit | 561dedcf3b381c385323fea8796b89f75826c50f (patch) | |
| tree | f560d507ad1e0bf8d3a5e95248aae971da3a0f75 | |
| parent | e1164591f7927402af8d73d340e75dbfeb06a288 (diff) | |
| download | util-linux-561dedcf3b381c385323fea8796b89f75826c50f.tar.gz | |
test: fix raid1 minimum I/O size
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>
| -rw-r--r-- | tests/expected/blkid/md-raid1-whole | 2 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-whole | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole index d715f3933e..ae5a95ddbb 100644 --- a/tests/expected/blkid/md-raid1-whole +++ b/tests/expected/blkid/md-raid1-whole @@ -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> diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole index 76ff8f8389..050adecd7a 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 |