From: Ruediger Meier Date: Wed, 3 Feb 2016 23:58:04 +0000 (+0100) Subject: tests: ts_fdisk_clean(), remove optimal iosize X-Git-Tag: v2.28-rc1~110^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01e8c90ca2fb840aeda2e83206ec37b959eab875;p=thirdparty%2Futil-linux.git tests: ts_fdisk_clean(), remove optimal iosize It's a pity a pity that we have to remove it. In past our test suite could discover a kernel bug (4.4). But now they've changed optimal iosizes on purpose. Signed-off-by: Ruediger Meier --- diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole index 83fbff356c..91ecba059d 100644 --- a/tests/expected/blkid/md-raid0-whole +++ b/tests/expected/blkid/md-raid0-whole @@ -24,7 +24,7 @@ Created a new . Command (m for help): Disk : 99.9 MiB, 104726528 bytes, 204544 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 65536 bytes / 131072 bytes +I/O size (minimum/optimal): 65536 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part index 8f73a694e7..781c65c908 100644 --- a/tests/expected/blkid/md-raid1-part +++ b/tests/expected/blkid/md-raid1-part @@ -22,7 +22,7 @@ Created a new . Command (m for help): Disk : 51 MiB, 53477376 bytes, 104448 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole index 6f93f54de3..d715f3933e 100644 --- a/tests/expected/blkid/md-raid1-whole +++ b/tests/expected/blkid/md-raid1-whole @@ -24,7 +24,7 @@ Created a new . 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 / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K index 49f93751df..8bdc50ece4 100644 --- a/tests/expected/fdisk/align-512-4K +++ b/tests/expected/fdisk/align-512-4K @@ -51,7 +51,7 @@ Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63 index 6e44cfe2bb..e469ab7a37 100644 --- a/tests/expected/fdisk/align-512-4K-63 +++ b/tests/expected/fdisk/align-512-4K-63 @@ -51,7 +51,7 @@ Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Alignment offset: 3584 bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md index 317865a86c..caca031541 100644 --- a/tests/expected/fdisk/align-512-4K-md +++ b/tests/expected/fdisk/align-512-4K-md @@ -22,7 +22,7 @@ Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Disklabel type: dos Disk identifier: @@ -61,7 +61,7 @@ Created a new . Command (m for help): Disk : 48.9 MiB, 51249152 bytes, 100096 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 65536 bytes / 131072 bytes +I/O size (minimum/optimal): 65536 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512 index 27df570513..ea24ba4ffd 100644 --- a/tests/expected/fdisk/align-512-512 +++ b/tests/expected/fdisk/align-512-512 @@ -51,7 +51,7 @@ Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology index 8ae0c40572..7856dcc048 100644 --- a/tests/expected/fdisk/align-512-512-topology +++ b/tests/expected/fdisk/align-512-512-topology @@ -51,7 +51,7 @@ Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/bsd b/tests/expected/fdisk/bsd index 360b14ae1b..be1ba7be0b 100644 --- a/tests/expected/fdisk/bsd +++ b/tests/expected/fdisk/bsd @@ -7,7 +7,7 @@ Create new DOS partition table Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: ------------------- @@ -19,7 +19,7 @@ ada64ace122978d00d1d1c0e5ee45d26 bsd.img Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -36,7 +36,7 @@ Set 2nd partition type Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -61,7 +61,7 @@ Command (m for help): Disk 2: 10 MiB, 10485760 bytes, 20480 sectors Geometry: 255 heads, 63 sectors/track, 1 cylinders Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: bsd Slice Start End Sectors Size Type Fsize Bsize Cpg @@ -90,7 +90,7 @@ Command (m for help): Disk 2: 10 MiB, 10485760 bytes, 20480 sectors Geometry: 255 heads, 63 sectors/track, 1 cylinders Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: bsd Slice Start End Sectors Size Type Fsize Bsize Cpg diff --git a/tests/expected/fdisk/gpt b/tests/expected/fdisk/gpt index 7218c0c83b..3244874a3b 100644 --- a/tests/expected/fdisk/gpt +++ b/tests/expected/fdisk/gpt @@ -5,7 +5,7 @@ Create new GPT partition table Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: ------------------- @@ -17,7 +17,7 @@ Change partition type by number Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: @@ -38,7 +38,7 @@ Change partition type by UUID Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: @@ -59,7 +59,7 @@ Delete partition Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: @@ -79,7 +79,7 @@ Create again partition Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: @@ -100,7 +100,7 @@ Corrupt primary table Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: @@ -121,7 +121,7 @@ Corrupt backup table Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode index 6b4d0e4018..657fbdc256 100644 --- a/tests/expected/fdisk/mbr-dos-mode +++ b/tests/expected/fdisk/mbr-dos-mode @@ -8,7 +8,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: ------------------- @@ -21,7 +21,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -37,7 +37,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -53,7 +53,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -69,7 +69,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -85,7 +85,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -102,7 +102,7 @@ Disk : 54.9 MiB, 57577472 bytes, 112456 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -123,7 +123,7 @@ Disk : 54.9 MiB, 57577472 bytes, 112456 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -141,7 +141,7 @@ Disk : 54.9 MiB, 57577472 bytes, 112456 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -162,7 +162,7 @@ Disk : 54.9 MiB, 57577472 bytes, 112456 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -182,7 +182,7 @@ Disk : 54.9 MiB, 57577472 bytes, 112456 sectors Geometry: 255 heads, 63 sectors/track, 1024 cylinders Units: cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: ------------------- diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode index c2a55c6dea..8833baa1c5 100644 --- a/tests/expected/fdisk/mbr-nondos-mode +++ b/tests/expected/fdisk/mbr-nondos-mode @@ -7,7 +7,7 @@ Create new DOS partition table Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: ------------------- @@ -19,7 +19,7 @@ e21e16b7452d82e2a2810a1de8c3db05 mbr-nondos-mode.img Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -34,7 +34,7 @@ Set primary partition active Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -49,7 +49,7 @@ a5543ee1e3d2cf79913a56bae893a0f0 mbr-nondos-mode.img Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -64,7 +64,7 @@ Create 2nd primary partition Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -80,7 +80,7 @@ Create extended partition Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -97,7 +97,7 @@ db4406e7bc0773f234fd1db1b58b5997 mbr-nondos-mode.img Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -118,7 +118,7 @@ de85b8d74f52f307b9467ea4c33438cb mbr-nondos-mode.img Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -136,7 +136,7 @@ Create another logical partition Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -157,7 +157,7 @@ Delete primary partition Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -177,7 +177,7 @@ Delete primary partition Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -196,7 +196,7 @@ e1ef48d3d42f4ebcfd5bf4baf5e370e9 mbr-nondos-mode.img Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: ------------------- diff --git a/tests/expected/fdisk/mbr-sort b/tests/expected/fdisk/mbr-sort index 7967fa4e29..e97e3b4f05 100644 --- a/tests/expected/fdisk/mbr-sort +++ b/tests/expected/fdisk/mbr-sort @@ -5,7 +5,7 @@ Create new DOS partition table Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: ------------------- @@ -16,7 +16,7 @@ Create primary partitions Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -35,7 +35,7 @@ Create logical partitions Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: @@ -58,7 +58,7 @@ Fix order. Disk : 20 MiB, 20971520 bytes, 40960 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel index 43214b1d15..9d294f30d5 100644 --- a/tests/expected/fdisk/sunlabel +++ b/tests/expected/fdisk/sunlabel @@ -6,7 +6,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 1 heads, 63 sectors/track, 325 cylinders Units: cylinders of 63 * 512 = 32256 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: sun Create first partition e730c7ec8208601f41963f0485147248 sunlabel.img @@ -14,7 +14,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 1 heads, 63 sectors/track, 325 cylinders Units: cylinders of 63 * 512 = 32256 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: sun Device Start End Cylinders Size Id Type Flags @@ -25,7 +25,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 1 heads, 63 sectors/track, 325 cylinders Units: cylinders of 63 * 512 = 32256 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: sun Device Start End Cylinders Size Id Type Flags @@ -36,7 +36,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 1 heads, 63 sectors/track, 325 cylinders Units: cylinders of 63 * 512 = 32256 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: sun Device Start End Cylinders Size Id Type Flags @@ -47,7 +47,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 1 heads, 63 sectors/track, 325 cylinders Units: cylinders of 63 * 512 = 32256 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: sun Device Start End Cylinders Size Id Type Flags @@ -70,7 +70,7 @@ Disk : 10 MiB, 10485760 bytes, 20480 sectors Geometry: 1 heads, 63 sectors/track, 325 cylinders Units: cylinders of 63 * 512 = 32256 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: sun Device Start End Cylinders Size Id Type Flags diff --git a/tests/expected/libfdisk/gpt-all-defaults b/tests/expected/libfdisk/gpt-all-defaults index 8836807440..665525e41d 100644 --- a/tests/expected/libfdisk/gpt-all-defaults +++ b/tests/expected/libfdisk/gpt-all-defaults @@ -3,7 +3,7 @@ Checking that no-one is using this disk right now ... OK Disk : 10 MiB, 10485760 bytes, 20480 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 512 bytes +I/O size (minimum/optimal): 512 bytes / bytes >>> Script header accepted. >>> Script header accepted. diff --git a/tests/expected/sfdisk/dos-activate b/tests/expected/sfdisk/dos-activate index 230a959ef5..72f2d25f59 100644 --- a/tests/expected/sfdisk/dos-activate +++ b/tests/expected/sfdisk/dos-activate @@ -6,7 +6,7 @@ Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/dos-dump-gaps b/tests/expected/sfdisk/dos-dump-gaps index 85870301ae..bc5be7190e 100644 --- a/tests/expected/sfdisk/dos-dump-gaps +++ b/tests/expected/sfdisk/dos-dump-gaps @@ -3,7 +3,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Created a new . diff --git a/tests/expected/sfdisk/dos-dump-old b/tests/expected/sfdisk/dos-dump-old index e6835f9b36..70194018e6 100644 --- a/tests/expected/sfdisk/dos-dump-old +++ b/tests/expected/sfdisk/dos-dump-old @@ -3,7 +3,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Created a new . diff --git a/tests/expected/sfdisk/dos-explicit-size b/tests/expected/sfdisk/dos-explicit-size index f951e4a9c8..d88f0b6879 100644 --- a/tests/expected/sfdisk/dos-explicit-size +++ b/tests/expected/sfdisk/dos-explicit-size @@ -10,7 +10,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Created a new . diff --git a/tests/expected/sfdisk/dos-read-dump b/tests/expected/sfdisk/dos-read-dump index 6296c226dd..1c00be647c 100644 --- a/tests/expected/sfdisk/dos-read-dump +++ b/tests/expected/sfdisk/dos-read-dump @@ -5,7 +5,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. diff --git a/tests/expected/sfdisk/dos-resize b/tests/expected/sfdisk/dos-resize index b721816a40..bb60fb4503 100644 --- a/tests/expected/sfdisk/dos-resize +++ b/tests/expected/sfdisk/dos-resize @@ -1,7 +1,7 @@ Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/dos-simple-commas b/tests/expected/sfdisk/dos-simple-commas index 58c95c9ecb..91e42fcd5a 100644 --- a/tests/expected/sfdisk/dos-simple-commas +++ b/tests/expected/sfdisk/dos-simple-commas @@ -3,7 +3,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Created a new . Created a new . diff --git a/tests/expected/sfdisk/dos-simple-space b/tests/expected/sfdisk/dos-simple-space index 214b3ae74c..cb39dc76cd 100644 --- a/tests/expected/sfdisk/dos-simple-space +++ b/tests/expected/sfdisk/dos-simple-space @@ -3,7 +3,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Created a new . Created a new . diff --git a/tests/expected/sfdisk/gpt-all-defaults b/tests/expected/sfdisk/gpt-all-defaults index e1989a4b98..8f1a0dcda5 100644 --- a/tests/expected/sfdisk/gpt-all-defaults +++ b/tests/expected/sfdisk/gpt-all-defaults @@ -3,7 +3,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. diff --git a/tests/expected/sfdisk/gpt-list-pmbr b/tests/expected/sfdisk/gpt-list-pmbr index 4df1bc0c47..2a1b140413 100644 --- a/tests/expected/sfdisk/gpt-list-pmbr +++ b/tests/expected/sfdisk/gpt-list-pmbr @@ -2,7 +2,7 @@ Partition 1 does not start on physical sector boundary. Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/gpt-read-dump b/tests/expected/sfdisk/gpt-read-dump index 704bdd9f76..8b3400601d 100644 --- a/tests/expected/sfdisk/gpt-read-dump +++ b/tests/expected/sfdisk/gpt-read-dump @@ -3,7 +3,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. @@ -28,7 +28,7 @@ Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/gpt-reorder b/tests/expected/sfdisk/gpt-reorder index 4448e08a9c..c68c4b4efe 100644 --- a/tests/expected/sfdisk/gpt-reorder +++ b/tests/expected/sfdisk/gpt-reorder @@ -3,7 +3,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes >>> Script header accepted. >>> Script header accepted. @@ -34,7 +34,7 @@ Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/gpt-resize b/tests/expected/sfdisk/gpt-resize index f4f17c73b2..a336495b8f 100644 --- a/tests/expected/sfdisk/gpt-resize +++ b/tests/expected/sfdisk/gpt-resize @@ -1,7 +1,7 @@ Disk : 50 MiB, 52428800 bytes, 102400 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes -I/O size (minimum/optimal): 4096 bytes / 32768 bytes +I/O size (minimum/optimal): 4096 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/movedata-down b/tests/expected/sfdisk/movedata-down index 6b5339801a..1640e16e94 100644 --- a/tests/expected/sfdisk/movedata-down +++ b/tests/expected/sfdisk/movedata-down @@ -1,7 +1,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/movedata-non-overlay b/tests/expected/sfdisk/movedata-non-overlay index 0a4d525ae7..5a31b7b057 100644 --- a/tests/expected/sfdisk/movedata-non-overlay +++ b/tests/expected/sfdisk/movedata-non-overlay @@ -1,7 +1,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/movedata-up b/tests/expected/sfdisk/movedata-up index 14f2122f37..dc348bd4ca 100644 --- a/tests/expected/sfdisk/movedata-up +++ b/tests/expected/sfdisk/movedata-up @@ -1,7 +1,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-0-move-up-absolute b/tests/expected/sfdisk/resize-dos-0-move-up-absolute index 6fb298f766..6419acf7b0 100644 --- a/tests/expected/sfdisk/resize-dos-0-move-up-absolute +++ b/tests/expected/sfdisk/resize-dos-0-move-up-absolute @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-1-move-down-absolute b/tests/expected/sfdisk/resize-dos-1-move-down-absolute index 9db9e6e438..e8097b26c9 100644 --- a/tests/expected/sfdisk/resize-dos-1-move-down-absolute +++ b/tests/expected/sfdisk/resize-dos-1-move-down-absolute @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-10-down-enlarge b/tests/expected/sfdisk/resize-dos-10-down-enlarge index bd8d4c7259..f4fbf8e02d 100644 --- a/tests/expected/sfdisk/resize-dos-10-down-enlarge +++ b/tests/expected/sfdisk/resize-dos-10-down-enlarge @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize index fabcd7059f..7d8447412f 100644 --- a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize +++ b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-12-reduce-midle b/tests/expected/sfdisk/resize-dos-12-reduce-midle index a992a8078b..544e03a6cb 100644 --- a/tests/expected/sfdisk/resize-dos-12-reduce-midle +++ b/tests/expected/sfdisk/resize-dos-12-reduce-midle @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-13-max-last b/tests/expected/sfdisk/resize-dos-13-max-last index 1680de77c5..ce8da907a2 100644 --- a/tests/expected/sfdisk/resize-dos-13-max-last +++ b/tests/expected/sfdisk/resize-dos-13-max-last @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-2-move-up-relative b/tests/expected/sfdisk/resize-dos-2-move-up-relative index dde3c7fd27..86fe6acf6c 100644 --- a/tests/expected/sfdisk/resize-dos-2-move-up-relative +++ b/tests/expected/sfdisk/resize-dos-2-move-up-relative @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-3-move-down-relative b/tests/expected/sfdisk/resize-dos-3-move-down-relative index b4db47840c..4bebc097e4 100644 --- a/tests/expected/sfdisk/resize-dos-3-move-down-relative +++ b/tests/expected/sfdisk/resize-dos-3-move-down-relative @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute index 6006068507..d38dd63b5e 100644 --- a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute +++ b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-5-reduce-absolute b/tests/expected/sfdisk/resize-dos-5-reduce-absolute index b11f635431..fda9211f09 100644 --- a/tests/expected/sfdisk/resize-dos-5-reduce-absolute +++ b/tests/expected/sfdisk/resize-dos-5-reduce-absolute @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-6-enlarge-relative b/tests/expected/sfdisk/resize-dos-6-enlarge-relative index 681bb93cb5..9643ef42a7 100644 --- a/tests/expected/sfdisk/resize-dos-6-enlarge-relative +++ b/tests/expected/sfdisk/resize-dos-6-enlarge-relative @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-7-reduce-relative b/tests/expected/sfdisk/resize-dos-7-reduce-relative index c2ab970bc9..35397085a9 100644 --- a/tests/expected/sfdisk/resize-dos-7-reduce-relative +++ b/tests/expected/sfdisk/resize-dos-7-reduce-relative @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-8-enlarge-all b/tests/expected/sfdisk/resize-dos-8-enlarge-all index f577aff337..b082e85953 100644 --- a/tests/expected/sfdisk/resize-dos-8-enlarge-all +++ b/tests/expected/sfdisk/resize-dos-8-enlarge-all @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-dos-9-up-preduce b/tests/expected/sfdisk/resize-dos-9-up-preduce index 829c98dba7..7dc9ade67f 100644 --- a/tests/expected/sfdisk/resize-dos-9-up-preduce +++ b/tests/expected/sfdisk/resize-dos-9-up-preduce @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: dos Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute index d337dbd54b..975cc57265 100644 --- a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute +++ b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute index 16233f73f8..78c2b72c7c 100644 --- a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute +++ b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-10-down-enlarge b/tests/expected/sfdisk/resize-gpt-10-down-enlarge index f2ed7fb5b6..aea694f428 100644 --- a/tests/expected/sfdisk/resize-gpt-10-down-enlarge +++ b/tests/expected/sfdisk/resize-gpt-10-down-enlarge @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize index bfa3d07d22..654f733f2c 100644 --- a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize +++ b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-12-reduce-midle b/tests/expected/sfdisk/resize-gpt-12-reduce-midle index aad0a6a283..4fd9ef1dfc 100644 --- a/tests/expected/sfdisk/resize-gpt-12-reduce-midle +++ b/tests/expected/sfdisk/resize-gpt-12-reduce-midle @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-13-max-last b/tests/expected/sfdisk/resize-gpt-13-max-last index b08a6fc939..8d34dfdf51 100644 --- a/tests/expected/sfdisk/resize-gpt-13-max-last +++ b/tests/expected/sfdisk/resize-gpt-13-max-last @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-2-move-up-relative b/tests/expected/sfdisk/resize-gpt-2-move-up-relative index 18c685ca0d..04d7682a7f 100644 --- a/tests/expected/sfdisk/resize-gpt-2-move-up-relative +++ b/tests/expected/sfdisk/resize-gpt-2-move-up-relative @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-3-move-down-relative b/tests/expected/sfdisk/resize-gpt-3-move-down-relative index 18252824d8..254fbc5ee8 100644 --- a/tests/expected/sfdisk/resize-gpt-3-move-down-relative +++ b/tests/expected/sfdisk/resize-gpt-3-move-down-relative @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute index 1cae0cdb8d..305da18927 100644 --- a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute +++ b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute index 3e5d33a2b5..647420c95f 100644 --- a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute +++ b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative index 8cea323f9d..258d35b4f9 100644 --- a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative +++ b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-7-reduce-relative b/tests/expected/sfdisk/resize-gpt-7-reduce-relative index 5b8fd43e46..3ded4fb82f 100644 --- a/tests/expected/sfdisk/resize-gpt-7-reduce-relative +++ b/tests/expected/sfdisk/resize-gpt-7-reduce-relative @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-8-enlarge-all b/tests/expected/sfdisk/resize-gpt-8-enlarge-all index 89bbe8395e..a98349d197 100644 --- a/tests/expected/sfdisk/resize-gpt-8-enlarge-all +++ b/tests/expected/sfdisk/resize-gpt-8-enlarge-all @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/expected/sfdisk/resize-gpt-9-up-preduce b/tests/expected/sfdisk/resize-gpt-9-up-preduce index bf0faa5710..cf174838f0 100644 --- a/tests/expected/sfdisk/resize-gpt-9-up-preduce +++ b/tests/expected/sfdisk/resize-gpt-9-up-preduce @@ -3,7 +3,7 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / 32768 bytes +I/O size (minimum/optimal): 512 bytes / bytes Disklabel type: gpt Disk identifier: diff --git a/tests/functions.sh b/tests/functions.sh index 8f6c877249..d3367e1a53 100644 --- a/tests/functions.sh +++ b/tests/functions.sh @@ -621,6 +621,7 @@ function ts_fdisk_clean { -e 's/^Device[[:blank:]]*Boot/Device Boot/' \ -e 's/Welcome to fdisk.*/Welcome to fdisk ./' \ -e 's/typescript file.*/typescript file ./' \ + -e 's@^\(I/O size (minimum/op.* bytes /\) [1-9][0-9]* @\1 @' \ $TS_OUTPUT }