ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'tests-raid1' of https://github.com/rudimeier/util-linux

This commit is contained in:
Karel Zak 2016-10-26 10:22:40 +02:00
parent bae57b5a3c 561dedcf3b
commit c95cad2098
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/expected/blkid/md-raid1-whole
View 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>

2
tests/ts/blkid/md-raid1-whole
View File

@ -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