From: Karel Zak Date: Thu, 30 Aug 2018 13:24:41 +0000 (+0200) Subject: tests: update fdisk output X-Git-Tag: v2.33-rc1~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e3bc261d04025cd20b1e6d8199aaa65b1acb85f;p=thirdparty%2Futil-linux.git tests: update fdisk output Signed-off-by: Karel Zak --- diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part index bf6c9d8a31..b568edbd11 100644 --- a/tests/expected/blkid/md-raid1-part +++ b/tests/expected/blkid/md-raid1-part @@ -20,6 +20,7 @@ Select (default p): Partition number (2-4, default 2): First sector (53248-10444 Created a new . Command (m for help): Disk : 51 MiB, 53477376 bytes, 104448 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K index 3a288d711b..e6aa145c9d 100644 --- a/tests/expected/fdisk/align-512-4K +++ b/tests/expected/fdisk/align-512-4K @@ -49,6 +49,7 @@ First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63 index a56abc0051..831e7dc989 100644 --- a/tests/expected/fdisk/align-512-4K-63 +++ b/tests/expected/fdisk/align-512-4K-63 @@ -49,6 +49,7 @@ First sector (61454-102399, default 88063): Last sector, +/-sectors or +/-size{K Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md index 217e630351..10f3ca6af1 100644 --- a/tests/expected/fdisk/align-512-4K-md +++ b/tests/expected/fdisk/align-512-4K-md @@ -20,6 +20,7 @@ Select (default p): Partition number (2-4, default 2): First sector (43008-10239 Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology index 758ad46e30..65420b6b92 100644 --- a/tests/expected/fdisk/align-512-512-topology +++ b/tests/expected/fdisk/align-512-512-topology @@ -49,6 +49,7 @@ First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K Created a new . Command (m for help): Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/dos-activate b/tests/expected/sfdisk/dos-activate index 72f2d25f59..59f460d92d 100644 --- a/tests/expected/sfdisk/dos-activate +++ b/tests/expected/sfdisk/dos-activate @@ -4,6 +4,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-dump-gaps b/tests/expected/sfdisk/dos-dump-gaps index e481925d4b..51ad609163 100644 --- a/tests/expected/sfdisk/dos-dump-gaps +++ b/tests/expected/sfdisk/dos-dump-gaps @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-dump-old b/tests/expected/sfdisk/dos-dump-old index 5940087a9e..06bbf281e3 100644 --- a/tests/expected/sfdisk/dos-dump-old +++ b/tests/expected/sfdisk/dos-dump-old @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-explicit-size b/tests/expected/sfdisk/dos-explicit-size index fd0156344b..10e07384b7 100644 --- a/tests/expected/sfdisk/dos-explicit-size +++ b/tests/expected/sfdisk/dos-explicit-size @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-read-dump b/tests/expected/sfdisk/dos-read-dump index ebc6fb408d..a25429c4b9 100644 --- a/tests/expected/sfdisk/dos-read-dump +++ b/tests/expected/sfdisk/dos-read-dump @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-read-dump-case b/tests/expected/sfdisk/dos-read-dump-case index 81df50701f..a6fc3f2579 100644 --- a/tests/expected/sfdisk/dos-read-dump-case +++ b/tests/expected/sfdisk/dos-read-dump-case @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-reduce-empty-extended b/tests/expected/sfdisk/dos-reduce-empty-extended index 7c6f8beab9..f37cdcf360 100644 --- a/tests/expected/sfdisk/dos-reduce-empty-extended +++ b/tests/expected/sfdisk/dos-reduce-empty-extended @@ -1,4 +1,5 @@ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-resize b/tests/expected/sfdisk/dos-resize index c82d15fb3a..a39b940f1b 100644 --- a/tests/expected/sfdisk/dos-resize +++ b/tests/expected/sfdisk/dos-resize @@ -1,4 +1,5 @@ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-resize-empty-extended b/tests/expected/sfdisk/dos-resize-empty-extended index 4a2759c7cb..14cecbe05f 100644 --- a/tests/expected/sfdisk/dos-resize-empty-extended +++ b/tests/expected/sfdisk/dos-resize-empty-extended @@ -1,4 +1,5 @@ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-resize-extended b/tests/expected/sfdisk/dos-resize-extended index 6b7b099e70..90dce82b66 100644 --- a/tests/expected/sfdisk/dos-resize-extended +++ b/tests/expected/sfdisk/dos-resize-extended @@ -1,4 +1,5 @@ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-resize-logical b/tests/expected/sfdisk/dos-resize-logical index 9ceb9a3275..f26a595caa 100644 --- a/tests/expected/sfdisk/dos-resize-logical +++ b/tests/expected/sfdisk/dos-resize-logical @@ -1,4 +1,5 @@ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-simple-commas b/tests/expected/sfdisk/dos-simple-commas index e0b3e3734c..ea69e0dc94 100644 --- a/tests/expected/sfdisk/dos-simple-commas +++ b/tests/expected/sfdisk/dos-simple-commas @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/dos-simple-space b/tests/expected/sfdisk/dos-simple-space index e690ba2558..858ddc9eae 100644 --- a/tests/expected/sfdisk/dos-simple-space +++ b/tests/expected/sfdisk/dos-simple-space @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/gpt-all-defaults b/tests/expected/sfdisk/gpt-all-defaults index 048ae3a9a3..b654dd7bcb 100644 --- a/tests/expected/sfdisk/gpt-all-defaults +++ b/tests/expected/sfdisk/gpt-all-defaults @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/gpt-read-dump b/tests/expected/sfdisk/gpt-read-dump index a836ea93f2..60d9922229 100644 --- a/tests/expected/sfdisk/gpt-read-dump +++ b/tests/expected/sfdisk/gpt-read-dump @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes @@ -29,6 +30,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/gpt-reorder b/tests/expected/sfdisk/gpt-reorder index afc71165b2..ff0ef07437 100644 --- a/tests/expected/sfdisk/gpt-reorder +++ b/tests/expected/sfdisk/gpt-reorder @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes @@ -35,6 +36,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/gpt-resize b/tests/expected/sfdisk/gpt-resize index c9385c3c2b..6e9d2e5c57 100644 --- a/tests/expected/sfdisk/gpt-resize +++ b/tests/expected/sfdisk/gpt-resize @@ -1,4 +1,5 @@ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/movedata-down b/tests/expected/sfdisk/movedata-down index 8301de1cce..ae256ad315 100644 --- a/tests/expected/sfdisk/movedata-down +++ b/tests/expected/sfdisk/movedata-down @@ -1,4 +1,5 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/movedata-non-overlay b/tests/expected/sfdisk/movedata-non-overlay index 3ea1e33e9e..733de1520c 100644 --- a/tests/expected/sfdisk/movedata-non-overlay +++ b/tests/expected/sfdisk/movedata-non-overlay @@ -1,4 +1,5 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/movedata-up b/tests/expected/sfdisk/movedata-up index 75d159cc5c..de5b175d24 100644 --- a/tests/expected/sfdisk/movedata-up +++ b/tests/expected/sfdisk/movedata-up @@ -1,4 +1,5 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-0-move-up-absolute b/tests/expected/sfdisk/resize-dos-0-move-up-absolute index 93c0f882d0..e1c069fb07 100644 --- a/tests/expected/sfdisk/resize-dos-0-move-up-absolute +++ b/tests/expected/sfdisk/resize-dos-0-move-up-absolute @@ -1,6 +1,7 @@ 3000, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-1-move-down-absolute b/tests/expected/sfdisk/resize-dos-1-move-down-absolute index 87ee9cad5d..da886357aa 100644 --- a/tests/expected/sfdisk/resize-dos-1-move-down-absolute +++ b/tests/expected/sfdisk/resize-dos-1-move-down-absolute @@ -1,6 +1,7 @@ 2048, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-10-down-enlarge b/tests/expected/sfdisk/resize-dos-10-down-enlarge index d8d2accf94..df392d831e 100644 --- a/tests/expected/sfdisk/resize-dos-10-down-enlarge +++ b/tests/expected/sfdisk/resize-dos-10-down-enlarge @@ -1,6 +1,7 @@ -10M,+10M,,* Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize index 6e7b9dbe23..43e6837b60 100644 --- a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize +++ b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize @@ -1,6 +1,7 @@ 2048,10M,L Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-12-reduce-midle b/tests/expected/sfdisk/resize-dos-12-reduce-midle index da52b1663c..669fd451b7 100644 --- a/tests/expected/sfdisk/resize-dos-12-reduce-midle +++ b/tests/expected/sfdisk/resize-dos-12-reduce-midle @@ -1,6 +1,7 @@ ,-5M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-13-max-last b/tests/expected/sfdisk/resize-dos-13-max-last index 4afc793a06..3664d88e44 100644 --- a/tests/expected/sfdisk/resize-dos-13-max-last +++ b/tests/expected/sfdisk/resize-dos-13-max-last @@ -1,6 +1,7 @@ -5M,+ Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-2-move-up-relative b/tests/expected/sfdisk/resize-dos-2-move-up-relative index 7ec898197d..75a95b175b 100644 --- a/tests/expected/sfdisk/resize-dos-2-move-up-relative +++ b/tests/expected/sfdisk/resize-dos-2-move-up-relative @@ -1,6 +1,7 @@ +1M, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-3-move-down-relative b/tests/expected/sfdisk/resize-dos-3-move-down-relative index 7053b39162..b3816e0e1c 100644 --- a/tests/expected/sfdisk/resize-dos-3-move-down-relative +++ b/tests/expected/sfdisk/resize-dos-3-move-down-relative @@ -1,6 +1,7 @@ -1M, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute index cb603dc5cc..0c18f9fb6b 100644 --- a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute +++ b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute @@ -1,6 +1,7 @@ -,15M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-5-reduce-absolute b/tests/expected/sfdisk/resize-dos-5-reduce-absolute index 55afbed9c7..557875d9e2 100644 --- a/tests/expected/sfdisk/resize-dos-5-reduce-absolute +++ b/tests/expected/sfdisk/resize-dos-5-reduce-absolute @@ -1,6 +1,7 @@ ,5M, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-6-enlarge-relative b/tests/expected/sfdisk/resize-dos-6-enlarge-relative index ee00490709..528d025a0b 100644 --- a/tests/expected/sfdisk/resize-dos-6-enlarge-relative +++ b/tests/expected/sfdisk/resize-dos-6-enlarge-relative @@ -1,6 +1,7 @@ , +10M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-7-reduce-relative b/tests/expected/sfdisk/resize-dos-7-reduce-relative index 8bb794e862..6a6fa0c504 100644 --- a/tests/expected/sfdisk/resize-dos-7-reduce-relative +++ b/tests/expected/sfdisk/resize-dos-7-reduce-relative @@ -1,6 +1,7 @@ , -10M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-8-enlarge-all b/tests/expected/sfdisk/resize-dos-8-enlarge-all index 50805522fe..2f6b3fb677 100644 --- a/tests/expected/sfdisk/resize-dos-8-enlarge-all +++ b/tests/expected/sfdisk/resize-dos-8-enlarge-all @@ -1,6 +1,7 @@ ,+ Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-9-up-preduce b/tests/expected/sfdisk/resize-dos-9-up-preduce index 17d24ea4e2..2ca6f3b104 100644 --- a/tests/expected/sfdisk/resize-dos-9-up-preduce +++ b/tests/expected/sfdisk/resize-dos-9-up-preduce @@ -1,6 +1,7 @@ +10M,-10M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-dos-unsorted b/tests/expected/sfdisk/resize-dos-unsorted index 21dbe5b12a..49133bb122 100644 --- a/tests/expected/sfdisk/resize-dos-unsorted +++ b/tests/expected/sfdisk/resize-dos-unsorted @@ -1,4 +1,5 @@ Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes @@ -34,6 +35,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute index 041e78e4a7..230841d7ce 100644 --- a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute +++ b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute @@ -1,6 +1,7 @@ 3000, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute index 24a9c9f1e3..de2a8718b3 100644 --- a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute +++ b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute @@ -1,6 +1,7 @@ 2048, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-10-down-enlarge b/tests/expected/sfdisk/resize-gpt-10-down-enlarge index 5d6de25b6a..037d0ab232 100644 --- a/tests/expected/sfdisk/resize-gpt-10-down-enlarge +++ b/tests/expected/sfdisk/resize-gpt-10-down-enlarge @@ -1,6 +1,7 @@ -10M,+10M,,* Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize index ea6342a573..351e858458 100644 --- a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize +++ b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize @@ -1,6 +1,7 @@ 2048,10M,L Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-12-reduce-midle b/tests/expected/sfdisk/resize-gpt-12-reduce-midle index 20bd555d2b..683cedee93 100644 --- a/tests/expected/sfdisk/resize-gpt-12-reduce-midle +++ b/tests/expected/sfdisk/resize-gpt-12-reduce-midle @@ -1,6 +1,7 @@ ,-5M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-13-max-last b/tests/expected/sfdisk/resize-gpt-13-max-last index bb6f3e1716..b0483f7a60 100644 --- a/tests/expected/sfdisk/resize-gpt-13-max-last +++ b/tests/expected/sfdisk/resize-gpt-13-max-last @@ -1,6 +1,7 @@ -5M,+ Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-2-move-up-relative b/tests/expected/sfdisk/resize-gpt-2-move-up-relative index 5ff108f087..7669dab5ba 100644 --- a/tests/expected/sfdisk/resize-gpt-2-move-up-relative +++ b/tests/expected/sfdisk/resize-gpt-2-move-up-relative @@ -1,6 +1,7 @@ +1M, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-3-move-down-relative b/tests/expected/sfdisk/resize-gpt-3-move-down-relative index 100a9cf652..c8aa63ac8c 100644 --- a/tests/expected/sfdisk/resize-gpt-3-move-down-relative +++ b/tests/expected/sfdisk/resize-gpt-3-move-down-relative @@ -1,6 +1,7 @@ -1M, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute index f984034570..832e112bcd 100644 --- a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute +++ b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute @@ -1,6 +1,7 @@ -,15M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute index 9c4a03454c..b21418342e 100644 --- a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute +++ b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute @@ -1,6 +1,7 @@ ,5M, Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative index 8977323190..a9090e22f0 100644 --- a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative +++ b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative @@ -1,6 +1,7 @@ , +10M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-7-reduce-relative b/tests/expected/sfdisk/resize-gpt-7-reduce-relative index ec85e1b3a7..7e391cdadb 100644 --- a/tests/expected/sfdisk/resize-gpt-7-reduce-relative +++ b/tests/expected/sfdisk/resize-gpt-7-reduce-relative @@ -1,6 +1,7 @@ , -10M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-8-enlarge-all b/tests/expected/sfdisk/resize-gpt-8-enlarge-all index f7a569cc74..d0c4c5e6f8 100644 --- a/tests/expected/sfdisk/resize-gpt-8-enlarge-all +++ b/tests/expected/sfdisk/resize-gpt-8-enlarge-all @@ -1,6 +1,7 @@ ,+ Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/resize-gpt-9-up-preduce b/tests/expected/sfdisk/resize-gpt-9-up-preduce index 6fab84fdd7..16d348a51f 100644 --- a/tests/expected/sfdisk/resize-gpt-9-up-preduce +++ b/tests/expected/sfdisk/resize-gpt-9-up-preduce @@ -1,6 +1,7 @@ +10M,-10M Disk : 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / bytes diff --git a/tests/expected/sfdisk/script-broken-1 b/tests/expected/sfdisk/script-broken-1 index 2dcc36ba33..6441c122fd 100644 --- a/tests/expected/sfdisk/script-broken-1 +++ b/tests/expected/sfdisk/script-broken-1 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/script-broken-2 b/tests/expected/sfdisk/script-broken-2 index 2dcc36ba33..6441c122fd 100644 --- a/tests/expected/sfdisk/script-broken-2 +++ b/tests/expected/sfdisk/script-broken-2 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/script-broken-3 b/tests/expected/sfdisk/script-broken-3 index 2dcc36ba33..6441c122fd 100644 --- a/tests/expected/sfdisk/script-broken-3 +++ b/tests/expected/sfdisk/script-broken-3 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/script-broken-4 b/tests/expected/sfdisk/script-broken-4 index 2dcc36ba33..6441c122fd 100644 --- a/tests/expected/sfdisk/script-broken-4 +++ b/tests/expected/sfdisk/script-broken-4 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/script-broken-5 b/tests/expected/sfdisk/script-broken-5 index 2dcc36ba33..6441c122fd 100644 --- a/tests/expected/sfdisk/script-broken-5 +++ b/tests/expected/sfdisk/script-broken-5 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/script-quotes b/tests/expected/sfdisk/script-quotes index 65f3905541..e38b8395ce 100644 --- a/tests/expected/sfdisk/script-quotes +++ b/tests/expected/sfdisk/script-quotes @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes @@ -29,6 +30,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/script-separator b/tests/expected/sfdisk/script-separator index e861cc07cf..db2f2c423b 100644 --- a/tests/expected/sfdisk/script-separator +++ b/tests/expected/sfdisk/script-separator @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes @@ -29,6 +30,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/script-type-and-id b/tests/expected/sfdisk/script-type-and-id index e04ee51ab2..c834f2290a 100644 --- a/tests/expected/sfdisk/script-type-and-id +++ b/tests/expected/sfdisk/script-type-and-id @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes @@ -29,6 +30,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos index f87eb67be5..c4b6cd808a 100644 --- a/tests/expected/sfdisk/wipe-fs-to-dos +++ b/tests/expected/sfdisk/wipe-fs-to-dos @@ -6,6 +6,7 @@ The old swap signature will be removed by a write command. Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos b/tests/expected/sfdisk/wipe-gpt-to-dos index 90c654f199..1c90e956cf 100644 --- a/tests/expected/sfdisk/wipe-gpt-to-dos +++ b/tests/expected/sfdisk/wipe-gpt-to-dos @@ -1,6 +1,7 @@ =====Create GPT================================ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes @@ -20,6 +21,7 @@ The partition table has been altered. =====Create DOS================================ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos-auto b/tests/expected/sfdisk/wipe-gpt-to-dos-auto index 8855859f04..ca060a8a61 100644 --- a/tests/expected/sfdisk/wipe-gpt-to-dos-auto +++ b/tests/expected/sfdisk/wipe-gpt-to-dos-auto @@ -1,6 +1,7 @@ =====Create GPT================================ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes @@ -27,6 +28,7 @@ The partition table has been altered. =====Create DOS================================ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes diff --git a/tests/expected/sfdisk/wipe-partition b/tests/expected/sfdisk/wipe-partition index eebd8eeb43..17fa2af7ec 100644 --- a/tests/expected/sfdisk/wipe-partition +++ b/tests/expected/sfdisk/wipe-partition @@ -1,6 +1,7 @@ =====Create GPT================================ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes @@ -26,6 +27,7 @@ Syncing disks. =====Create GPT (again)================================ Disk : 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes