From: Karel Zak Date: Tue, 8 Oct 2013 14:37:13 +0000 (+0200) Subject: tests: update fdisk outputs X-Git-Tag: v2.24-rc2~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4200ebd60561433459546a9dedfcd07b4d97dfcb;p=thirdparty%2Futil-linux.git tests: update fdisk outputs Signed-off-by: Karel Zak --- diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole index e4978cbee3..f0b3e81b3b 100644 --- a/tests/expected/blkid/md-raid0-whole +++ b/tests/expected/blkid/md-raid0-whole @@ -28,7 +28,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part index 133fdcec92..7b206cf66a 100644 --- a/tests/expected/blkid/md-raid1-part +++ b/tests/expected/blkid/md-raid1-part @@ -26,7 +26,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole index 4db226ad5a..6a0333fb3c 100644 --- a/tests/expected/blkid/md-raid1-whole +++ b/tests/expected/blkid/md-raid1-whole @@ -28,7 +28,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K index 7ad9512a0b..08da6a20bc 100644 --- a/tests/expected/fdisk/align-512-4K +++ b/tests/expected/fdisk/align-512-4K @@ -57,7 +57,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63 index 0165abe336..f2515ac78d 100644 --- a/tests/expected/fdisk/align-512-4K-63 +++ b/tests/expected/fdisk/align-512-4K-63 @@ -58,7 +58,7 @@ Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / 32768 bytes Alignment offset: 3584 bytes -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md index beb7f27eff..03ebcccd55 100644 --- a/tests/expected/fdisk/align-512-4K-md +++ b/tests/expected/fdisk/align-512-4K-md @@ -26,7 +26,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -69,7 +69,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512 index a047582a53..498fc65606 100644 --- a/tests/expected/fdisk/align-512-512 +++ b/tests/expected/fdisk/align-512-512 @@ -57,7 +57,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology index 1cab4faf00..7f4f851db4 100644 --- a/tests/expected/fdisk/align-512-512-topology +++ b/tests/expected/fdisk/align-512-512-topology @@ -57,7 +57,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System diff --git a/tests/expected/fdisk/bsd b/tests/expected/fdisk/bsd index 3502c74596..addc7459e2 100644 --- a/tests/expected/fdisk/bsd +++ b/tests/expected/fdisk/bsd @@ -8,7 +8,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: @@ -22,7 +22,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -40,7 +40,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -58,14 +58,14 @@ Changes will remain in memory only, until you decide to write them. Be careful before using the write command. -Command (m for help): Entering to nested BSD disk label +Command (m for help): Entering nested BSD disklabel. 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 -Disk label type: bsd +Disklabel type: bsd partitions: 4 # Start End Size Type fsize bsize cpg @@ -73,7 +73,7 @@ c 4096 20479 16384 unused 0 0 d 0 16064 16065 unused 0 0 Command (m for help): -Leaving nested disk label. +Leaving nested disklabel. Command (m for help): ------------------- @@ -86,14 +86,14 @@ Changes will remain in memory only, until you decide to write them. Be careful before using the write command. -Command (m for help): Entering to nested BSD disk label +Command (m for help): Entering nested BSD disklabel. 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 -Disk label type: bsd +Disklabel type: bsd partitions: 4 # Start End Size Type fsize bsize cpg @@ -102,7 +102,7 @@ c 4096 20479 16384 unused 0 0 d 0 16064 16065 unused 0 0 Command (m for help): -Leaving nested disk label. +Leaving nested disklabel. Command (m for help): ------------------- @@ -113,7 +113,7 @@ Changes will remain in memory only, until you decide to write them. Be careful before using the write command. -Command (m for help): Entering to nested BSD disk label +Command (m for help): Entering nested BSD disklabel. Command (m for help): 0 unused 5 4.1BSD 9 4.4LFS d boot diff --git a/tests/expected/fdisk/gpt b/tests/expected/fdisk/gpt index 7cdf603b18..db0d92ff2d 100644 --- a/tests/expected/fdisk/gpt +++ b/tests/expected/fdisk/gpt @@ -6,7 +6,7 @@ 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 -Disk label type: gpt +Disklabel type: gpt Disk identifier: @@ -20,7 +20,7 @@ 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 -Disk label type: gpt +Disklabel type: gpt Disk identifier: Device Start End Size Type @@ -42,7 +42,7 @@ 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 -Disk label type: gpt +Disklabel type: gpt Disk identifier: Device Start End Size Type @@ -64,7 +64,7 @@ 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 -Disk label type: gpt +Disklabel type: gpt Disk identifier: Device Start End Size Type @@ -85,7 +85,7 @@ 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 -Disk label type: gpt +Disklabel type: gpt Disk identifier: Device Start End Size Type diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode index 27f863600c..2a0460b62a 100644 --- a/tests/expected/fdisk/mbr-dos-mode +++ b/tests/expected/fdisk/mbr-dos-mode @@ -9,7 +9,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: @@ -24,7 +24,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -41,7 +41,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -58,7 +58,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -75,7 +75,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -92,7 +92,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -110,7 +110,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -132,7 +132,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -151,7 +151,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -173,7 +173,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -194,7 +194,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode index f8f7525bd6..b3f28ff7b4 100644 --- a/tests/expected/fdisk/mbr-nondos-mode +++ b/tests/expected/fdisk/mbr-nondos-mode @@ -8,7 +8,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: @@ -22,7 +22,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -38,7 +38,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -54,7 +54,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -70,7 +70,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -87,7 +87,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -105,7 +105,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -127,7 +127,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -146,7 +146,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -168,7 +168,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -189,7 +189,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: Device Boot Start End Blocks Id System @@ -209,7 +209,7 @@ 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 -Disk label type: dos +Disklabel type: dos Disk identifier: diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel index 15ff6edd0a..f833613677 100644 --- a/tests/expected/fdisk/sunlabel +++ b/tests/expected/fdisk/sunlabel @@ -8,7 +8,7 @@ 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 -Disk label type: sun +Disklabel type: sun Create first partition @@ -19,7 +19,7 @@ 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 -Disk label type: sun +Disklabel type: sun Device Flag Start End Blocks Id System 1 0 128 4032 83 Linux native @@ -32,7 +32,7 @@ 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 -Disk label type: sun +Disklabel type: sun Device Flag Start End Blocks Id System 1 0 128 4032 4 SunOS usr @@ -45,7 +45,7 @@ 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 -Disk label type: sun +Disklabel type: sun Device Flag Start End Blocks Id System 1 r 0 128 4032 4 SunOS usr @@ -58,7 +58,7 @@ 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 -Disk label type: sun +Disklabel type: sun Device Flag Start End Blocks Id System 1 ur 0 128 4032 4 SunOS usr @@ -83,7 +83,7 @@ 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 -Disk label type: sun +Disklabel type: sun Device Flag Start End Blocks Id System 1 ur 0 128 4032 4 SunOS usr