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 <ruediger.meier@ga-group.nl>

diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole
index 83fbff356c91562cf3aa5cde320bb802bb511189..91ecba059dc60a479874ee626412947c5cc345a9 100644 (file)
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -24,7 +24,7 @@ Created a new <removed>.
 Command (m for help): Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index 8f73a694e7de8d4084a9465b98265dfe76d27497..781c65c908d6d7ad558f64486796ce5182807c31 100644 (file)
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -22,7 +22,7 @@ Created a new <removed>.
 Command (m for help): Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index 6f93f54de385a36db5a6a86bc5c3e49416fab87b..d715f3933e9ef84b7729901da1a1a5693e4c46df 100644 (file)
--- 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 / 512 bytes
+I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 49f93751df7d4b7f81c397598d8fb1b6bd0f08ee..8bdc50ece4552a9ce79c5635194696301c05a150 100644 (file)
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -51,7 +51,7 @@ Created a new <removed>.
 Command (m for help): Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 6e44cfe2bb7402a269d474c3bb5bb9c156356717..e469ab7a37db1c58fd5389a84b3ae2079306da3d 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -51,7 +51,7 @@ Created a new <removed>.
 Command (m for help): Disk <removed>: 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 / <removed> bytes
 Alignment offset: 3584 bytes
 Disklabel type: dos
 Disk identifier: <removed>

diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 317865a86c47be9c10846330af7db1ab257c7b38..caca0315418f0cbd494373e0e640aa3c2781e715 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -22,7 +22,7 @@ Created a new <removed>.
 Command (m for help): Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -61,7 +61,7 @@ Created a new <removed>.
 Command (m for help): Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index 27df5705135be1ee6d0f37b5d5150012d77ba98f..ea24ba4ffd225bed2a34a343b10cb263a04d4378 100644 (file)
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -51,7 +51,7 @@ Created a new <removed>.
 Command (m for help): Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 8ae0c4057233c0c8a7562e0c432dc601a9cea9bb..7856dcc04858910ec4cc80907597d2cf77ee4e3f 100644 (file)
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -51,7 +51,7 @@ Created a new <removed>.
 Command (m for help): Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/fdisk/bsd b/tests/expected/fdisk/bsd
index 360b14ae1ba5a5e82da96f6d63f7c5eeaab415a1..be1ba7be0beb845c6e4b53b2c3a9fdb0793de21d 100644 (file)
--- a/tests/expected/fdisk/bsd
+++ b/tests/expected/fdisk/bsd
@@ -7,7 +7,7 @@ Create new DOS partition table
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 -------------------
@@ -19,7 +19,7 @@ ada64ace122978d00d1d1c0e5ee45d26 bsd.img
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -36,7 +36,7 @@ Set 2nd partition type
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -61,7 +61,7 @@ Command (m for help): Disk <removed>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 / <removed> bytes
 Disklabel type: bsd
 
 Slice Start   End Sectors  Size Type     Fsize Bsize Cpg
@@ -90,7 +90,7 @@ Command (m for help): Disk <removed>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 / <removed> 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 7218c0c83b0582157a76070b71f71a26ab224ef8..3244874a3bc241c32a6b591e8a4b70eb875ccece 100644 (file)
--- a/tests/expected/fdisk/gpt
+++ b/tests/expected/fdisk/gpt
@@ -5,7 +5,7 @@ Create new GPT partition table
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 -------------------
@@ -17,7 +17,7 @@ Change partition type by number
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 
@@ -38,7 +38,7 @@ Change partition type by UUID
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 
@@ -59,7 +59,7 @@ Delete partition
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 
@@ -79,7 +79,7 @@ Create again partition
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 
@@ -100,7 +100,7 @@ Corrupt primary table
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 
@@ -121,7 +121,7 @@ Corrupt backup table
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode
index 6b4d0e40186b3ff3805e70125a4f91e5b406f149..657fbdc25657e8c56a4aad1be4178be1b1d04c6a 100644 (file)
--- a/tests/expected/fdisk/mbr-dos-mode
+++ b/tests/expected/fdisk/mbr-dos-mode
@@ -8,7 +8,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 -------------------
@@ -21,7 +21,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -37,7 +37,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -53,7 +53,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -69,7 +69,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -85,7 +85,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -102,7 +102,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -123,7 +123,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -141,7 +141,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -162,7 +162,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -182,7 +182,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 -------------------

diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode
index c2a55c6dea14fafbe9232700f04ec0a4ef6407e5..8833baa1c54fed783581c5c8f86bb55267591b3d 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode
+++ b/tests/expected/fdisk/mbr-nondos-mode
@@ -7,7 +7,7 @@ Create new DOS partition table
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 -------------------
@@ -19,7 +19,7 @@ e21e16b7452d82e2a2810a1de8c3db05 mbr-nondos-mode.img
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -34,7 +34,7 @@ Set primary partition active
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -49,7 +49,7 @@ a5543ee1e3d2cf79913a56bae893a0f0 mbr-nondos-mode.img
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -64,7 +64,7 @@ Create 2nd primary partition
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -80,7 +80,7 @@ Create extended partition
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -97,7 +97,7 @@ db4406e7bc0773f234fd1db1b58b5997 mbr-nondos-mode.img
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -118,7 +118,7 @@ de85b8d74f52f307b9467ea4c33438cb mbr-nondos-mode.img
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -136,7 +136,7 @@ Create another logical partition
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -157,7 +157,7 @@ Delete primary partition
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -177,7 +177,7 @@ Delete primary partition
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -196,7 +196,7 @@ e1ef48d3d42f4ebcfd5bf4baf5e370e9 mbr-nondos-mode.img
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 -------------------

diff --git a/tests/expected/fdisk/mbr-sort b/tests/expected/fdisk/mbr-sort
index 7967fa4e292ba4e0f77ada6f7b8ae662c23a2e87..e97e3b4f05edd7a2b70c45948664dc968c4fb21f 100644 (file)
--- a/tests/expected/fdisk/mbr-sort
+++ b/tests/expected/fdisk/mbr-sort
@@ -5,7 +5,7 @@ Create new DOS partition table
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 -------------------
@@ -16,7 +16,7 @@ Create primary partitions
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -35,7 +35,7 @@ Create logical partitions
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
@@ -58,7 +58,7 @@ Fix order.
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel
index 43214b1d159c691b72593ecaf55c48efbda410db..9d294f30d55fd31a5371929a49c6b7106a4ce88c 100644 (file)
--- a/tests/expected/fdisk/sunlabel
+++ b/tests/expected/fdisk/sunlabel
@@ -6,7 +6,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: sun
 Create first partition
 e730c7ec8208601f41963f0485147248 sunlabel.img
@@ -14,7 +14,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: sun
 
 Device             Start   End Cylinders Size Id Type         Flags
@@ -25,7 +25,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: sun
 
 Device             Start   End Cylinders Size Id Type      Flags
@@ -36,7 +36,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: sun
 
 Device             Start   End Cylinders Size Id Type      Flags
@@ -47,7 +47,7 @@ Disk <removed>: 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 / <removed> bytes
 Disklabel type: sun
 
 Device             Start   End Cylinders Size Id Type      Flags
@@ -70,7 +70,7 @@ Disk <removed>: 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 / <removed> 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 883680744027681d62f601e137cd80f25839b391..665525e41db4f4a20b1a63db8cccebe4ee17b3ad 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.

diff --git a/tests/expected/sfdisk/dos-activate b/tests/expected/sfdisk/dos-activate
index 230a959ef5df334300942731a145df7c44f7c11e..72f2d25f599c9b6ceec6b76f7ea628c3ad4f3fe1 100644 (file)
--- a/tests/expected/sfdisk/dos-activate
+++ b/tests/expected/sfdisk/dos-activate
@@ -6,7 +6,7 @@ Syncing disks.
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/dos-dump-gaps b/tests/expected/sfdisk/dos-dump-gaps
index 85870301ae1a2ef881223ed41c4cc4f9d937a09b..bc5be7190ed1efebb54fc910133fde15db16242e 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Script header accepted.
 >>> Created a new <removed>.

diff --git a/tests/expected/sfdisk/dos-dump-old b/tests/expected/sfdisk/dos-dump-old
index e6835f9b36a43509ecc1839940d007c824c23ed9..70194018e6be5d2d804d531de9dbbee15b834707 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Script header accepted.
 >>> Created a new <removed>.

diff --git a/tests/expected/sfdisk/dos-explicit-size b/tests/expected/sfdisk/dos-explicit-size
index f951e4a9c8f61282333344eadbf915e42936c4b2..d88f0b6879440e4e37355348e0b4240d4917f9ec 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Script header accepted.
 >>> Created a new <removed>.

diff --git a/tests/expected/sfdisk/dos-read-dump b/tests/expected/sfdisk/dos-read-dump
index 6296c226ddbf2f53cce3e781e1fccc87bb742da1..1c00be647ceca66a445783c903dba22e766e0112 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.

diff --git a/tests/expected/sfdisk/dos-resize b/tests/expected/sfdisk/dos-resize
index b721816a409f82c8ff74a8a5bfdc135070dcde2d..bb60fb45032be2e4f25f97ba1e13b19eb93c3e94 100644 (file)
--- a/tests/expected/sfdisk/dos-resize
+++ b/tests/expected/sfdisk/dos-resize
@@ -1,7 +1,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/dos-simple-commas b/tests/expected/sfdisk/dos-simple-commas
index 58c95c9ecbd82b796e89be05081ca53636f8d590..91e42fcd5a822d4fbe22ffb5460d6cb3ff1d608a 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Created a new <removed>.
 Created a new <removed>.

diff --git a/tests/expected/sfdisk/dos-simple-space b/tests/expected/sfdisk/dos-simple-space
index 214b3ae74c799c02a5173e8cad1382e25833a556..cb39dc76cd1cadb96e99167b27e364cbb9a9332c 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Created a new <removed>.
 Created a new <removed>.

diff --git a/tests/expected/sfdisk/gpt-all-defaults b/tests/expected/sfdisk/gpt-all-defaults
index e1989a4b989d99bf9d1323a0373212d9c78592ce..8f1a0dcda5ed809b8b84fc9acf45fca43bf4315e 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.

diff --git a/tests/expected/sfdisk/gpt-list-pmbr b/tests/expected/sfdisk/gpt-list-pmbr
index 4df1bc0c4712649eb62d7cecfebdf3d35d2c3cb8..2a1b14041372dba21181f73592c1311161ec3e85 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/gpt-read-dump b/tests/expected/sfdisk/gpt-read-dump
index 704bdd9f761e2b290a3632e3387d3066baef05b9..8b3400601dc05e05d7072e9ff093cc5f5cc48775 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
@@ -28,7 +28,7 @@ Syncing disks.
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/gpt-reorder b/tests/expected/sfdisk/gpt-reorder
index 4448e08a9c24b4e5d75cc6db4d6643748c685640..c68c4b4efe626a257df129dddc1b6eb6debea37b 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
@@ -34,7 +34,7 @@ Syncing disks.
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/gpt-resize b/tests/expected/sfdisk/gpt-resize
index f4f17c73b24e3d214eb5f44d5c3ea86446462e7c..a336495b8fc5612036cbfd264f99f6bb15414286 100644 (file)
--- a/tests/expected/sfdisk/gpt-resize
+++ b/tests/expected/sfdisk/gpt-resize
@@ -1,7 +1,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/movedata-down b/tests/expected/sfdisk/movedata-down
index 6b5339801aa063561bc37332afc40627a106e95c..1640e16e94d306f48882fff78b8131cc0a593711 100644 (file)
--- a/tests/expected/sfdisk/movedata-down
+++ b/tests/expected/sfdisk/movedata-down
@@ -1,7 +1,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/movedata-non-overlay b/tests/expected/sfdisk/movedata-non-overlay
index 0a4d525ae76491bc64846977bdc085eecf2156a5..5a31b7b0570065fb51bae98a55177afa58d1d2c3 100644 (file)
--- a/tests/expected/sfdisk/movedata-non-overlay
+++ b/tests/expected/sfdisk/movedata-non-overlay
@@ -1,7 +1,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/movedata-up b/tests/expected/sfdisk/movedata-up
index 14f2122f37712cf58e24818286e51dd32454f592..dc348bd4ca59f49b50ec9d4f5db5fbcdc570aff2 100644 (file)
--- a/tests/expected/sfdisk/movedata-up
+++ b/tests/expected/sfdisk/movedata-up
@@ -1,7 +1,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-0-move-up-absolute b/tests/expected/sfdisk/resize-dos-0-move-up-absolute
index 6fb298f76664bfed7859aed43bd9c8cc4f38b836..6419acf7b054e5a3175e90ab054034087ca6d8a4 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-1-move-down-absolute b/tests/expected/sfdisk/resize-dos-1-move-down-absolute
index 9db9e6e438e5c9d9de91b2715d0cde36d62c2e85..e8097b26c9d247c5577bed5a18d2e9a4310fbc84 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-10-down-enlarge b/tests/expected/sfdisk/resize-dos-10-down-enlarge
index bd8d4c72594d85c4536569c92c4b36057fb3c8b4..f4fbf8e02de7e8d648303aa96c5a501773a32704 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-10-down-enlarge
+++ b/tests/expected/sfdisk/resize-dos-10-down-enlarge
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize
index fabcd7059f608b8bfc8d7709f91d4d8ed9ded344..7d8447412f58a0a0f56403e3dc9ab72edc238de3 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-12-reduce-midle b/tests/expected/sfdisk/resize-dos-12-reduce-midle
index a992a8078ba876d589e949e1815fc37f298c03fa..544e03a6cb9a48a447eedb8a4abab3242517c137 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-12-reduce-midle
+++ b/tests/expected/sfdisk/resize-dos-12-reduce-midle
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-13-max-last b/tests/expected/sfdisk/resize-dos-13-max-last
index 1680de77c54cf2f157efe142b232be3e8f99489a..ce8da907a2e1c2605bbc52fded90ebd1203b3781 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-13-max-last
+++ b/tests/expected/sfdisk/resize-dos-13-max-last
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-2-move-up-relative b/tests/expected/sfdisk/resize-dos-2-move-up-relative
index dde3c7fd274404938546b4173575471c81b33bcd..86fe6acf6ce5852486d504d7990c89a5f6570d07 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-3-move-down-relative b/tests/expected/sfdisk/resize-dos-3-move-down-relative
index b4db47840c0a6bd68754900a453b2934d133f852..4bebc097e4581b5c0eb72b2cd972544968829e47 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute
index 6006068507ec07706268f18acf020f31f7719a43..d38dd63b5e9c873b9f120e78279857941d2a47b8 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute
+++ b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-5-reduce-absolute b/tests/expected/sfdisk/resize-dos-5-reduce-absolute
index b11f635431af6d001ea42c376421751c5e182f7a..fda9211f0991cf9b1f3beadb92e8af99115ace6b 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-5-reduce-absolute
+++ b/tests/expected/sfdisk/resize-dos-5-reduce-absolute
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-6-enlarge-relative b/tests/expected/sfdisk/resize-dos-6-enlarge-relative
index 681bb93cb5f7ccb72afc6f517b47f2d0540a0cd2..9643ef42a766861114d70c45348b8d5532505271 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-6-enlarge-relative
+++ b/tests/expected/sfdisk/resize-dos-6-enlarge-relative
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-7-reduce-relative b/tests/expected/sfdisk/resize-dos-7-reduce-relative
index c2ab970bc907d562fb709a5301e0690b4ce2a83c..35397085a971e6d0293a22cd1653942c7f4807c1 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-7-reduce-relative
+++ b/tests/expected/sfdisk/resize-dos-7-reduce-relative
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-8-enlarge-all b/tests/expected/sfdisk/resize-dos-8-enlarge-all
index f577aff33786fdbb8c6748f4e8beb401c2c51939..b082e859538efa0adca374352de4ae948350d7cb 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-8-enlarge-all
+++ b/tests/expected/sfdisk/resize-dos-8-enlarge-all
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-dos-9-up-preduce b/tests/expected/sfdisk/resize-dos-9-up-preduce
index 829c98dba70b173a4229275dcb82a4443c24eb6f..7dc9ade67fc60ca6bc8af21bdc986c5ab444edee 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-9-up-preduce
+++ b/tests/expected/sfdisk/resize-dos-9-up-preduce
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute
index d337dbd54b717b64e810103cc6d41329c5aac39b..975cc5726551db5ba011b7119e6879e1c62189b4 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute
index 16233f73f877da25b239f0a8f8251a725facadf6..78c2b72c7ce3e9d4b0baf4d254ecdc5745f9ebbd 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-10-down-enlarge b/tests/expected/sfdisk/resize-gpt-10-down-enlarge
index f2ed7fb5b6469486d0e02ea34322f5216f2007eb..aea694f428810a68a6e1d029468b5b80e9eacd9d 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-10-down-enlarge
+++ b/tests/expected/sfdisk/resize-gpt-10-down-enlarge
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize
index bfa3d07d2263ca08053d505e6a55382abacf25f2..654f733f2c53bfa616d248f1b7c811a7ed2cc195 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-12-reduce-midle b/tests/expected/sfdisk/resize-gpt-12-reduce-midle
index aad0a6a28385d16031ea0e4637a5e41941610b60..4fd9ef1dfcb51d6c6f9871f2d1baf56a1485cbab 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-12-reduce-midle
+++ b/tests/expected/sfdisk/resize-gpt-12-reduce-midle
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-13-max-last b/tests/expected/sfdisk/resize-gpt-13-max-last
index b08a6fc939ecae0fbed4e3c6976557cb661a4890..8d34dfdf517d7a1f0fe109fd3e713a932c0972b2 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-13-max-last
+++ b/tests/expected/sfdisk/resize-gpt-13-max-last
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-2-move-up-relative b/tests/expected/sfdisk/resize-gpt-2-move-up-relative
index 18c685ca0def7fc031a5071b260eafbc79be5b0d..04d7682a7f68857238b0fbff7f1fc17a807ff4c2 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-3-move-down-relative b/tests/expected/sfdisk/resize-gpt-3-move-down-relative
index 18252824d8db8e31e7fdcaf108eab264b758b89a..254fbc5ee8b50dbf1d8f3708d845882fcc1e0edc 100644 (file)
--- 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 <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute
index 1cae0cdb8d1e5b1cd90c0a3465230e258f3ab2e4..305da18927f0fe1ada0050446ecb373008f1a39c 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute
+++ b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute
index 3e5d33a2b5abad894c2cf70f0f7da72f5f30603d..647420c95f8008d0accff4c8006857433fa6ade7 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute
+++ b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative
index 8cea323f9d39643eb933dd2f0ffb97fa91f83ca5..258d35b4f9f499095c61663ef23bebdb4e13df8e 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative
+++ b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-7-reduce-relative b/tests/expected/sfdisk/resize-gpt-7-reduce-relative
index 5b8fd43e46814a629ffb54ffcd72693ed62137ce..3ded4fb82ffb58c8d9f8224f0fb3953333bc514f 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-7-reduce-relative
+++ b/tests/expected/sfdisk/resize-gpt-7-reduce-relative
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-8-enlarge-all b/tests/expected/sfdisk/resize-gpt-8-enlarge-all
index 89bbe8395edccfde36dc3eb1cb6a1a5bed971a30..a98349d197f7a547b15494c9b865e1c6d89c0185 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-8-enlarge-all
+++ b/tests/expected/sfdisk/resize-gpt-8-enlarge-all
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/expected/sfdisk/resize-gpt-9-up-preduce b/tests/expected/sfdisk/resize-gpt-9-up-preduce
index bf0faa5710fa1fc688c0ad34c6cb7741896147ca..cf174838f0edb5c9356f7a01d7a30210ebb72ed7 100644 (file)
--- a/tests/expected/sfdisk/resize-gpt-9-up-preduce
+++ b/tests/expected/sfdisk/resize-gpt-9-up-preduce
@@ -3,7 +3,7 @@
 Disk <removed>: 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 / <removed> bytes
 Disklabel type: gpt
 Disk identifier: <removed>
 

diff --git a/tests/functions.sh b/tests/functions.sh
index 8f6c877249b10ee630fececa168fc930402bd978..d3367e1a5363bc886d05fbe13aedba309063f5b3 100644 (file)
--- 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 <removed>./' \
                -e 's/typescript file.*/typescript file <removed>./' \
+               -e 's@^\(I/O size (minimum/op.* bytes /\) [1-9][0-9]* @\1 <removed> @' \
                $TS_OUTPUT
 }