From: Karel Zak Date: Tue, 11 Mar 2014 11:35:44 +0000 (+0100) Subject: tests: update fdisk MBR and SUN tests X-Git-Tag: v2.25-rc1~441 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9b7d7a60f46706def6d159def342c0288d919e4;p=thirdparty%2Futil-linux.git tests: update fdisk MBR and SUN tests Signed-off-by: Karel Zak --- diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode index 2a0460b62a..dfb31238b4 100644 --- a/tests/expected/fdisk/mbr-dos-mode +++ b/tests/expected/fdisk/mbr-dos-mode @@ -27,8 +27,8 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 1 1 8001 83 Linux +Device Boot Start End Cylinders Size Id Type +1 1 1 1 7.8M 83 Linux ------------------- @@ -44,8 +44,8 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 1 1 8001 bf Solaris +Device Boot Start End Cylinders Size Id Type +1 1 1 1 7.8M bf Solaris ------------------- @@ -61,8 +61,8 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 * 1 1 8001 bf Solaris +Device Boot Start End Cylinders Size Id Type +1 * 1 1 1 7.8M bf Solaris ------------------- @@ -78,8 +78,8 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 1 1 8001 83 Linux +Device Boot Start End Cylinders Size Id Type +1 1 1 1 7.8M 83 Linux ------------------- @@ -95,9 +95,9 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 1 1 8001 83 Linux -2 2 12 88357+ 5 Extended +Device Boot Start End Cylinders Size Id Type +1 1 1 1 7.8M 83 Linux +2 2 12 12 86.3M 5 Extended ------------------- @@ -113,13 +113,13 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 1 1 8001 83 Linux -2 2 12 88357+ 5 Extended -5 2 3 16033+ 83 Linux -6 4 5 16033+ 83 Linux -7 6 7 16033+ 83 Linux -8 8 9 16033+ 83 Linux +Device Boot Start End Cylinders Size Id Type +1 1 1 1 7.8M 83 Linux +2 2 12 12 86.3M 5 Extended +5 2 3 2 15.7M 83 Linux +6 4 5 2 15.7M 83 Linux +7 6 7 2 15.7M 83 Linux +8 8 9 2 15.7M 83 Linux ------------------- @@ -135,10 +135,10 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 1 1 8001 83 Linux -2 2 12 88357+ 5 Extended -5 6 7 16033+ 83 Linux +Device Boot Start End Cylinders Size Id Type +1 1 1 1 7.8M 83 Linux +2 2 12 12 86.3M 5 Extended +5 6 7 2 15.7M 83 Linux ------------------- @@ -154,13 +154,11 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 1 1 8001 83 Linux -2 2 12 88357+ 5 Extended -5 6 7 16033+ 83 Linux -6 2 3 16033+ 83 Linux - -Partition table entries are not in disk order. +Device Boot Start End Cylinders Size Id Type +1 1 1 1 7.8M 83 Linux +2 2 12 12 86.3M 5 Extended +5 6 7 2 15.7M 83 Linux +6 2 3 2 15.7M 83 Linux ------------------- @@ -176,12 +174,10 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -2 2 12 88357+ 5 Extended -5 6 7 16033+ 83 Linux -6 2 3 16033+ 83 Linux - -Partition table entries are not in disk order. +Device Boot Start End Cylinders Size Id Type +2 2 12 12 86.3M 5 Extended +5 6 7 2 15.7M 83 Linux +6 2 3 2 15.7M 83 Linux ------------------- diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode index b3f28ff7b4..6894c46c05 100644 --- a/tests/expected/fdisk/mbr-nondos-mode +++ b/tests/expected/fdisk/mbr-nondos-mode @@ -25,8 +25,8 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 2048 8191 3072 83 Linux +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux ------------------- @@ -41,8 +41,8 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 * 2048 8191 3072 83 Linux +Device Boot Start End Sectors Size Id Type +1 * 2048 8191 6144 3M 83 Linux ------------------- @@ -57,8 +57,8 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 2048 8191 3072 83 Linux +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux ------------------- @@ -73,9 +73,9 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 2048 8191 3072 83 Linux -2 8192 12287 2048 83 Linux +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux ------------------- @@ -90,10 +90,10 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 2048 8191 3072 83 Linux -2 8192 12287 2048 83 Linux -3 12288 40959 14336 5 Extended +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended ------------------- @@ -108,14 +108,14 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 2048 8191 3072 83 Linux -2 8192 12287 2048 83 Linux -3 12288 40959 14336 5 Extended -5 14336 18431 2048 83 Linux -6 20480 24575 2048 83 Linux -7 26624 30719 2048 83 Linux -8 32768 36863 2048 83 Linux +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +5 14336 18431 4096 2M 83 Linux +6 20480 24575 4096 2M 83 Linux +7 26624 30719 4096 2M 83 Linux +8 32768 36863 4096 2M 83 Linux ------------------- @@ -130,11 +130,11 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 2048 8191 3072 83 Linux -2 8192 12287 2048 83 Linux -3 12288 40959 14336 5 Extended -5 26624 30719 2048 83 Linux +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +5 26624 30719 4096 2M 83 Linux ------------------- @@ -149,14 +149,12 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -1 2048 8191 3072 83 Linux -2 8192 12287 2048 83 Linux -3 12288 40959 14336 5 Extended -5 26624 30719 2048 83 Linux -6 14336 18431 2048 83 Linux - -Partition table entries are not in disk order. +Device Boot Start End Sectors Size Id Type +1 2048 8191 6144 3M 83 Linux +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +5 26624 30719 4096 2M 83 Linux +6 14336 18431 4096 2M 83 Linux ------------------- @@ -171,13 +169,11 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -2 8192 12287 2048 83 Linux -3 12288 40959 14336 5 Extended -5 26624 30719 2048 83 Linux -6 14336 18431 2048 83 Linux - -Partition table entries are not in disk order. +Device Boot Start End Sectors Size Id Type +2 8192 12287 4096 2M 83 Linux +3 12288 40959 28672 14M 5 Extended +5 26624 30719 4096 2M 83 Linux +6 14336 18431 4096 2M 83 Linux ------------------- @@ -192,12 +188,10 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: dos Disk identifier: -Device Boot Start End Blocks Id System -3 12288 40959 14336 5 Extended -5 26624 30719 2048 83 Linux -6 14336 18431 2048 83 Linux - -Partition table entries are not in disk order. +Device Boot Start End Sectors Size Id Type +3 12288 40959 28672 14M 5 Extended +5 26624 30719 4096 2M 83 Linux +6 14336 18431 4096 2M 83 Linux ------------------- diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel index f833613677..2b3d8c2207 100644 --- a/tests/expected/fdisk/sunlabel +++ b/tests/expected/fdisk/sunlabel @@ -21,8 +21,8 @@ Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: sun -Device Flag Start End Blocks Id System -1 0 128 4032 83 Linux native +Device Start End Cylinders Size Id Type Flags +1 1 128 129 4M 83 Linux native Set partition sysid df75defdb97fbd56222aed18631a22d0 sunlabel.img @@ -34,8 +34,8 @@ Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: sun -Device Flag Start End Blocks Id System -1 0 128 4032 4 SunOS usr +Device Start End Cylinders Size Id Type Flags +1 1 128 129 4M 4 SunOS usr Set first partition readonly da23f66698d9a553162887621d4c7490 sunlabel.img @@ -47,8 +47,8 @@ Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: sun -Device Flag Start End Blocks Id System -1 r 0 128 4032 4 SunOS usr +Device Start End Cylinders Size Id Type Flags +1 1 128 129 4M 4 SunOS usr r Set first partition mountable 3ab76e8491b103eab52b2ae1856c1e30 sunlabel.img @@ -60,8 +60,8 @@ Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: sun -Device Flag Start End Blocks Id System -1 ur 0 128 4032 4 SunOS usr +Device Start End Cylinders Size Id Type Flags +1 1 128 129 4M 4 SunOS usr ur Create second partition @@ -85,9 +85,9 @@ Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: sun -Device Flag Start End Blocks Id System -1 ur 0 128 4032 4 SunOS usr -2 128 325 6205+ 83 Linux native +Device Start End Cylinders Size Id Type Flags +1 1 128 129 4M 4 SunOS usr ur +2 129 325 198 6.1M 83 Linux native Delete all partitions 502ba7a0cfdce2849c3a99881f0590c3 sunlabel.img