tests: fdisk: Layout with more details

Use fdisk -x instead of fdisk -l for printing layout in fdisk tests. This
can help debugging why some fdisk tests fail.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>

diff --git a/tests/expected/fdisk/bsd_1_0.LE b/tests/expected/fdisk/bsd_1_0.LE
index 71de66a0e0216bbce07e09d9b697ddc967254120..617974c9f513d7925f3764456d3d45a161b75c1d 100644 (file)
--- a/tests/expected/fdisk/bsd_1_0.LE
+++ b/tests/expected/fdisk/bsd_1_0.LE
@@ -47,8 +47,8 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  4095    2048   1M 83 Linux
+Device     Boot Start   End Sectors Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  4095    2048 83 Linux     0/32/33    0/65/1 
 -------------------
 
 Create 2nd primary partition
@@ -82,9 +82,9 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  4095    2048   1M 83 Linux
-<removed>2       4096 20479   16384   8M a5 FreeBSD
+Device     Boot Start   End Sectors Id Type    Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  4095    2048 83 Linux       0/32/33    0/65/1 
+<removed>2       4096 20479   16384 a5 FreeBSD      62/4/1  310/19/1 
 -------------------
 
 Create default BSD

diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode
index 5bc1fbf9c019fddb7481f79219c4448a5d0459bc..2b2048467accbb630c280d6c44dbab5a5393e351 100644 (file)
--- a/tests/expected/fdisk/mbr-dos-mode
+++ b/tests/expected/fdisk/mbr-dos-mode
@@ -25,8 +25,8 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>1          1   1         1  7.8M 83 Linux
+Device     Boot Start End Cylinders Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1          1   1         1 83 Linux       0/1/1  0/254/63 
 -------------------
 
 Set partition type
@@ -41,8 +41,8 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>1          1   1         1  7.8M bf Solaris
+Device     Boot Start End Cylinders Id Type    Start-C/H/S End-C/H/S Attrs
+<removed>1          1   1         1 bf Solaris       0/1/1  0/254/63 
 -------------------
 
 Set primary partition active
@@ -57,8 +57,8 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>1 *        1   1         1  7.8M bf Solaris
+Device     Boot Start End Cylinders Id Type    Start-C/H/S End-C/H/S Attrs
+<removed>1 *        1   1         1 bf Solaris       0/1/1  0/254/63    80
 -------------------
 
 Re-create primary partition
@@ -73,8 +73,8 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>1          1   1         1  7.8M 83 Linux
+Device     Boot Start End Cylinders Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1          1   1         1 83 Linux       0/1/1  0/254/63 
 -------------------
 
 Create extended partition
@@ -89,9 +89,9 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>1          1   1         1  7.8M 83 Linux
-<removed>2          2  12        12 86.3M  5 Extended
+Device     Boot Start End Cylinders Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1          1   1         1 83 Linux          0/1/1  0/254/63 
+<removed>2          2  12        12  5 Extended       1/0/1 11/254/63 
 -------------------
 
 Create logical partitions
@@ -106,13 +106,13 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>1          1   1         1  7.8M 83 Linux
-<removed>2          2  12        12 86.3M  5 Extended
-<removed>5          2   3         2 15.7M 83 Linux
-<removed>6          4   5         2 15.7M 83 Linux
-<removed>7          6   7         2 15.7M 83 Linux
-<removed>8          8   9         2 15.7M 83 Linux
+Device     Boot Start End Cylinders Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1          1   1         1 83 Linux          0/1/1  0/254/63 
+<removed>2          2  12        12  5 Extended       1/0/1 11/254/63 
+<removed>5          2   3         2 83 Linux          1/1/1  2/254/63 
+<removed>6          4   5         2 83 Linux          3/1/1  4/254/63 
+<removed>7          6   7         2 83 Linux          5/1/1  6/254/63 
+<removed>8          8   9         2 83 Linux          7/1/1  8/254/63 
 -------------------
 
 Delete logical partitions
@@ -127,10 +127,10 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>1          1   1         1  7.8M 83 Linux
-<removed>2          2  12        12 86.3M  5 Extended
-<removed>5          6   7         2 15.7M 83 Linux
+Device     Boot Start End Cylinders Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1          1   1         1 83 Linux          0/1/1  0/254/63 
+<removed>2          2  12        12  5 Extended       1/0/1 11/254/63 
+<removed>5          6   7         2 83 Linux          5/1/1  6/254/63 
 -------------------
 
 Create another logical partition
@@ -145,11 +145,11 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>1          1   1         1  7.8M 83 Linux
-<removed>2          2  12        12 86.3M  5 Extended
-<removed>5          6   7         2 15.7M 83 Linux
-<removed>6          2   3         2 15.7M 83 Linux
+Device     Boot Start End Cylinders Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1          1   1         1 83 Linux          0/1/1  0/254/63 
+<removed>2          2  12        12  5 Extended       1/0/1 11/254/63 
+<removed>5          6   7         2 83 Linux          5/1/1  6/254/63 
+<removed>6          2   3         2 83 Linux          1/1/1  2/254/63 
 
 Partition table entries are not in disk order.
 -------------------
@@ -166,10 +166,10 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start End Cylinders  Size Id Type
-<removed>2          2  12        12 86.3M  5 Extended
-<removed>5          6   7         2 15.7M 83 Linux
-<removed>6          2   3         2 15.7M 83 Linux
+Device     Boot Start End Cylinders Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>2          2  12        12  5 Extended       1/0/1 11/254/63 
+<removed>5          6   7         2 83 Linux          5/1/1  6/254/63 
+<removed>6          2   3         2 83 Linux          1/1/1  2/254/63 
 
 Partition table entries are not in disk order.
 -------------------

diff --git a/tests/expected/fdisk/mbr-nondos-mode-1nd-primary-delete b/tests/expected/fdisk/mbr-nondos-mode-1nd-primary-delete
index cc5e1f0f57f3321d3de682ecbb072f76c9f05610..a63924419fe541747ead5331bdb97c5009a1795a 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-1nd-primary-delete
+++ b/tests/expected/fdisk/mbr-nondos-mode-1nd-primary-delete
@@ -9,10 +9,10 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>3      12288 40959   28672  14M  5 Extended
-<removed>5      26624 30719    4096   2M 83 Linux
-<removed>6      14336 18431    4096   2M 83 Linux
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>3      12288 40959   28672  5 Extended     0/195/4  2/140/10 
+<removed>5      26624 30719    4096 83 Linux       1/167/39  1/232/39 
+<removed>6      14336 18431    4096 83 Linux       0/227/36   1/37/36 
 
 Partition table entries are not in disk order.
 -------------------

diff --git a/tests/expected/fdisk/mbr-nondos-mode-1st-active b/tests/expected/fdisk/mbr-nondos-mode-1st-active
index 76b761a807b244842b7918dfc1d1365164de46f3..564c0433cfac1bbef66b457998b3c0ab8986ff2f 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-1st-active
+++ b/tests/expected/fdisk/mbr-nondos-mode-1st-active
@@ -9,7 +9,7 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1 *     2048  8191    6144   3M 83 Linux
+Device     Boot Start   End Sectors Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1 *     2048  8191    6144 83 Linux     0/32/33   0/130/2    80
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-nondos-mode-1st-primary b/tests/expected/fdisk/mbr-nondos-mode-1st-primary
index df4bf2ef01f3b75a31f3949b17e68f5c785ecb67..8747bb9dc7a4d40c05c43f3daf0504fb0d0cfcfc 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-1st-primary
+++ b/tests/expected/fdisk/mbr-nondos-mode-1st-primary
@@ -9,7 +9,7 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  8191    6144   3M 83 Linux
+Device     Boot Start   End Sectors Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  8191    6144 83 Linux     0/32/33   0/130/2 
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-nondos-mode-1st-primary-delete b/tests/expected/fdisk/mbr-nondos-mode-1st-primary-delete
index 7fce4e4afd25fdc8e7cc200c16c61990a1af5878..c5fbac2b28e2d590c61a08cc2be7089564354a08 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-1st-primary-delete
+++ b/tests/expected/fdisk/mbr-nondos-mode-1st-primary-delete
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>2       8192 12287    4096   2M 83 Linux
-<removed>3      12288 40959   28672  14M  5 Extended
-<removed>5      26624 30719    4096   2M 83 Linux
-<removed>6      14336 18431    4096   2M 83 Linux
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>2       8192 12287    4096 83 Linux        117/1/1  175/18/2 
+<removed>3      12288 40959   28672  5 Extended     0/195/4  2/140/10 
+<removed>5      26624 30719    4096 83 Linux       1/167/39  1/232/39 
+<removed>6      14336 18431    4096 83 Linux       0/227/36   1/37/36 
 
 Partition table entries are not in disk order.
 -------------------

diff --git a/tests/expected/fdisk/mbr-nondos-mode-1st-primary-recreate b/tests/expected/fdisk/mbr-nondos-mode-1st-primary-recreate
index 80e00790bb501b5f1c86fda35042e211dd184185..3951f5863104f4757cd4e1d6845b3d72f203beb7 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-1st-primary-recreate
+++ b/tests/expected/fdisk/mbr-nondos-mode-1st-primary-recreate
@@ -9,7 +9,7 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  8191    6144   3M 83 Linux
+Device     Boot Start   End Sectors Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  8191    6144 83 Linux     7/107/1   31/34/2 
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-nondos-mode-2nd-primary b/tests/expected/fdisk/mbr-nondos-mode-2nd-primary
index 0b24808ade76d8b65cebddd36793de0a7d81ad3a..0a197c9ccec9b40822d2d158b5745dc85b155cd7 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-2nd-primary
+++ b/tests/expected/fdisk/mbr-nondos-mode-2nd-primary
@@ -9,8 +9,8 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  8191    6144   3M 83 Linux
-<removed>2       8192 12287    4096   2M 83 Linux
+Device     Boot Start   End Sectors Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  8191    6144 83 Linux     7/107/1   31/34/2 
+<removed>2       8192 12287    4096 83 Linux     117/1/1  175/18/2 
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-nondos-mode-extended b/tests/expected/fdisk/mbr-nondos-mode-extended
index 3b8c736aa7f171a7c2fba55499c1bc234184db99..be8c887dc4303fe6b50c41be070a05353a99a598 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-extended
+++ b/tests/expected/fdisk/mbr-nondos-mode-extended
@@ -9,9 +9,9 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  8191    6144   3M 83 Linux
-<removed>2       8192 12287    4096   2M 83 Linux
-<removed>3      12288 40959   28672  14M  5 Extended
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  8191    6144 83 Linux        7/107/1   31/34/2 
+<removed>2       8192 12287    4096 83 Linux        117/1/1  175/18/2 
+<removed>3      12288 40959   28672  5 Extended     0/195/4  2/140/10 
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end b/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end
index d5c5f45ed0dee4ef6e9e922894d62737131ad439..58c58b4953de0e3bdd3ee945ae366da2eb06eff7 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end
+++ b/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end
@@ -9,8 +9,8 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors  Size Id Type
-<removed>1      20000 40959   20960 10.2M 83 Linux
+Device     Boot Start   End Sectors Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1      20000 40959   20960 83 Linux     1/62/30  2/140/10 
 -------------------
 
 Create 2nd primary at the begin of device
@@ -38,9 +38,9 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors  Size Id Type
-<removed>1      20000 40959   20960 10.2M 83 Linux
-<removed>2       2048 19999   17952  8.8M 83 Linux
+Device     Boot Start   End Sectors Id Type  Start-C/H/S End-C/H/S Attrs
+<removed>1      20000 40959   20960 83 Linux     1/62/30  2/140/10 
+<removed>2       2048 19999   17952 83 Linux      1/63/9  14/25/10 
 
 Partition table entries are not in disk order.
 -------------------

diff --git a/tests/expected/fdisk/mbr-nondos-mode-logical b/tests/expected/fdisk/mbr-nondos-mode-logical
index ee98105eb0fb94fa65f3ebc98f940635df752412..4e88454f51d3b934249e51e9512d3dff99f160a0 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-logical
+++ b/tests/expected/fdisk/mbr-nondos-mode-logical
@@ -9,13 +9,13 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  8191    6144   3M 83 Linux
-<removed>2       8192 12287    4096   2M 83 Linux
-<removed>3      12288 40959   28672  14M  5 Extended
-<removed>5      14336 18431    4096   2M 83 Linux
-<removed>6      20480 24575    4096   2M 83 Linux
-<removed>7      26624 30719    4096   2M 83 Linux
-<removed>8      32768 36863    4096   2M 83 Linux
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  8191    6144 83 Linux        7/107/1   31/34/2 
+<removed>2       8192 12287    4096 83 Linux        117/1/1  175/18/2 
+<removed>3      12288 40959   28672  5 Extended     0/195/4  2/140/10 
+<removed>5      14336 18431    4096 83 Linux       0/227/36   1/37/36 
+<removed>6      20480 24575    4096 83 Linux         1/70/6   1/135/6 
+<removed>7      26624 30719    4096 83 Linux       1/167/39  1/232/39 
+<removed>8      32768 36863    4096 83 Linux         2/10/9    2/75/9 
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-nondos-mode-logical-delete b/tests/expected/fdisk/mbr-nondos-mode-logical-delete
index ca9cd49d1414628994c5bf3a66d60a85f5f41b4b..261b70689e6c8a52096eaa7383fd6bb9715b3e72 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-logical-delete
+++ b/tests/expected/fdisk/mbr-nondos-mode-logical-delete
@@ -9,10 +9,10 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  8191    6144   3M 83 Linux
-<removed>2       8192 12287    4096   2M 83 Linux
-<removed>3      12288 40959   28672  14M  5 Extended
-<removed>5      26624 30719    4096   2M 83 Linux
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  8191    6144 83 Linux        7/107/1   31/34/2 
+<removed>2       8192 12287    4096 83 Linux        117/1/1  175/18/2 
+<removed>3      12288 40959   28672  5 Extended     0/195/4  2/140/10 
+<removed>5      26624 30719    4096 83 Linux       1/167/39  1/232/39 
 -------------------
 

diff --git a/tests/expected/fdisk/mbr-nondos-mode-logical-recreate b/tests/expected/fdisk/mbr-nondos-mode-logical-recreate
index 3b16015d849e0030ec35c387ed4581d8b80082be..7e5f943005e8acad9cdb00c0d18ec5d451735ca4 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-logical-recreate
+++ b/tests/expected/fdisk/mbr-nondos-mode-logical-recreate
@@ -9,12 +9,12 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  8191    6144   3M 83 Linux
-<removed>2       8192 12287    4096   2M 83 Linux
-<removed>3      12288 40959   28672  14M  5 Extended
-<removed>5      26624 30719    4096   2M 83 Linux
-<removed>6      14336 18431    4096   2M 83 Linux
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  8191    6144 83 Linux        7/107/1   31/34/2 
+<removed>2       8192 12287    4096 83 Linux        117/1/1  175/18/2 
+<removed>3      12288 40959   28672  5 Extended     0/195/4  2/140/10 
+<removed>5      26624 30719    4096 83 Linux       1/167/39  1/232/39 
+<removed>6      14336 18431    4096 83 Linux       0/227/36   1/37/36 
 
 Partition table entries are not in disk order.
 -------------------

diff --git a/tests/expected/fdisk/mbr-sort b/tests/expected/fdisk/mbr-sort
index e97e3b4f05edd7a2b70c45948664dc968c4fb21f..bb57432c038bb351132f7cae0f41bb36dc4914e4 100644 (file)
--- a/tests/expected/fdisk/mbr-sort
+++ b/tests/expected/fdisk/mbr-sort
@@ -20,11 +20,11 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       4096  6143    2048   1M 83 Linux
-<removed>2       2048  4095    2048   1M 83 Linux
-<removed>3       6144  8191    2048   1M 83 Linux
-<removed>4       8192 40959   32768  16M  5 Extended
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1       4096  6143    2048 83 Linux         0/65/2   0/97/33 
+<removed>2       2048  4095    2048 83 Linux        0/32/33    0/65/1 
+<removed>3       6144  8191    2048 83 Linux        0/97/34   0/130/2 
+<removed>4       8192 40959   32768  5 Extended     0/130/3  2/140/10 
 
 Partition table entries are not in disk order.
 -------------------
@@ -39,15 +39,15 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       4096  6143    2048   1M 83 Linux
-<removed>2       2048  4095    2048   1M 83 Linux
-<removed>3       6144  8191    2048   1M 83 Linux
-<removed>4       8192 40959   32768  16M  5 Extended
-<removed>5      14336 16383    2048   1M 83 Linux
-<removed>6      22528 24575    2048   1M 83 Linux
-<removed>7      18432 20479    2048   1M 83 Linux
-<removed>8      10240 12287    2048   1M 83 Linux
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1       4096  6143    2048 83 Linux         0/65/2   0/97/33 
+<removed>2       2048  4095    2048 83 Linux        0/32/33    0/65/1 
+<removed>3       6144  8191    2048 83 Linux        0/97/34   0/130/2 
+<removed>4       8192 40959   32768  5 Extended     0/130/3  2/140/10 
+<removed>5      14336 16383    2048 83 Linux       0/227/36     1/5/4 
+<removed>6      22528 24575    2048 83 Linux       1/102/38   1/135/6 
+<removed>7      18432 20479    2048 83 Linux        1/37/37    1/70/5 
+<removed>8      10240 12287    2048 83 Linux       0/162/35   0/195/3 
 
 Partition table entries are not in disk order.
 -------------------
@@ -62,14 +62,14 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot Start   End Sectors Size Id Type
-<removed>1       2048  4095    2048   1M 83 Linux
-<removed>2       4096  6143    2048   1M 83 Linux
-<removed>3       6144  8191    2048   1M 83 Linux
-<removed>4       8192 40959   32768  16M  5 Extended
-<removed>5      10240 12287    2048   1M 83 Linux
-<removed>6      14336 16383    2048   1M 83 Linux
-<removed>7      18432 20479    2048   1M 83 Linux
-<removed>8      22528 24575    2048   1M 83 Linux
+Device     Boot Start   End Sectors Id Type     Start-C/H/S End-C/H/S Attrs
+<removed>1       2048  4095    2048 83 Linux        0/32/33    0/65/1 
+<removed>2       4096  6143    2048 83 Linux         0/65/2   0/97/33 
+<removed>3       6144  8191    2048 83 Linux        0/97/34   0/130/2 
+<removed>4       8192 40959   32768  5 Extended     0/130/3  2/140/10 
+<removed>5      10240 12287    2048 83 Linux       0/162/35   0/195/3 
+<removed>6      14336 16383    2048 83 Linux       0/227/36     1/5/4 
+<removed>7      18432 20479    2048 83 Linux        1/37/37    1/70/5 
+<removed>8      22528 24575    2048 83 Linux       1/102/38   1/135/6 
 -------------------
 

diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel
index 5a24dd2d6b9890c5f809a9565e027f937ad3c999..bb1f5a8606e8780116625b2e5a652a7c13d46592 100644 (file)
--- a/tests/expected/fdisk/sunlabel
+++ b/tests/expected/fdisk/sunlabel
@@ -8,6 +8,12 @@ Units: cylinders of 63 * 512 = 32256 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: sun
+Label ID: Linux cyl 325 alt 0 hd 1 sec 63
+Rpm: 5400
+Alternate cylinders: 0
+Physical cylinders: 325
+Extra sects/cyl: 0
+Interleave: 1
 Create first partition
 e730c7ec8208601f41963f0485147248 sunlabel.img
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
@@ -16,9 +22,15 @@ Units: cylinders of 63 * 512 = 32256 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: sun
+Label ID: Linux cyl 325 alt 0 hd 1 sec 63
+Rpm: 5400
+Alternate cylinders: 0
+Physical cylinders: 325
+Extra sects/cyl: 0
+Interleave: 1
 
-Device             Start   End Cylinders  Size Id Type         Flags
-<removed>1     1   128       129  3.9M 83 Linux native 
+Device             Start   End Cylinders    Size Id Type         Flags
+<removed>1     1   128       129 4128768 83 Linux native 
 Set partition sysid
 df75defdb97fbd56222aed18631a22d0 sunlabel.img
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
@@ -27,9 +39,15 @@ Units: cylinders of 63 * 512 = 32256 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: sun
+Label ID: Linux cyl 325 alt 0 hd 1 sec 63
+Rpm: 5400
+Alternate cylinders: 0
+Physical cylinders: 325
+Extra sects/cyl: 0
+Interleave: 1
 
-Device             Start   End Cylinders  Size Id Type      Flags
-<removed>1     1   128       129  3.9M  4 SunOS usr 
+Device             Start   End Cylinders    Size Id Type      Flags
+<removed>1     1   128       129 4128768  4 SunOS usr 
 Set first partition readonly
 da23f66698d9a553162887621d4c7490 sunlabel.img
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
@@ -38,9 +56,15 @@ Units: cylinders of 63 * 512 = 32256 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: sun
+Label ID: Linux cyl 325 alt 0 hd 1 sec 63
+Rpm: 5400
+Alternate cylinders: 0
+Physical cylinders: 325
+Extra sects/cyl: 0
+Interleave: 1
 
-Device             Start   End Cylinders  Size Id Type      Flags
-<removed>1     1   128       129  3.9M  4 SunOS usr     r
+Device             Start   End Cylinders    Size Id Type      Flags
+<removed>1     1   128       129 4128768  4 SunOS usr     r
 Set first partition mountable
 3ab76e8491b103eab52b2ae1856c1e30 sunlabel.img
 Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors
@@ -49,9 +73,15 @@ Units: cylinders of 63 * 512 = 32256 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: sun
+Label ID: Linux cyl 325 alt 0 hd 1 sec 63
+Rpm: 5400
+Alternate cylinders: 0
+Physical cylinders: 325
+Extra sects/cyl: 0
+Interleave: 1
 
-Device             Start   End Cylinders  Size Id Type      Flags
-<removed>1     1   128       129  3.9M  4 SunOS usr    ur
+Device             Start   End Cylinders    Size Id Type      Flags
+<removed>1     1   128       129 4128768  4 SunOS usr    ur
 Create second partition
 
 Welcome to fdisk <removed>.
@@ -72,9 +102,15 @@ Units: cylinders of 63 * 512 = 32256 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / <removed> bytes
 Disklabel type: sun
+Label ID: Linux cyl 325 alt 0 hd 1 sec 63
+Rpm: 5400
+Alternate cylinders: 0
+Physical cylinders: 325
+Extra sects/cyl: 0
+Interleave: 1
 
-Device             Start   End Cylinders  Size Id Type         Flags
-<removed>1     1   128       129  3.9M  4 SunOS usr       ur
-<removed>2   129   325       198  6.1M 83 Linux native 
+Device             Start   End Cylinders    Size Id Type         Flags
+<removed>1     1   128       129 4128768  4 SunOS usr       ur
+<removed>2   129   325       198 6354432 83 Linux native 
 Delete all partitions
 502ba7a0cfdce2849c3a99881f0590c3 sunlabel.img

diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index 675468d4254fb965ebb893bceee3eee0b3268cf0..9ce272386b340575298452b43912b81888bcafef 100755 (executable)
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -76,7 +76,7 @@ TS_EXPECTED+="_${BSD_LABELSECTOR}_${BSD_LABELOFFSET}${BSD_EXTRA}.${BYTE_ORDER}"
 
 function print_layout {
        echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-       $TS_CMD_FDISK -l ${TEST_IMAGE_NAME}  >> $TS_OUTPUT
+       $TS_CMD_FDISK -x ${TEST_IMAGE_NAME}  >> $TS_OUTPUT
        echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }
 

diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode
index 4e62cb211d35fb9611eae5a7de90fd5c6f81d673..f869e26596d6c76890791a2b38698a770154807e 100755 (executable)
--- a/tests/ts/fdisk/mbr-dos-mode
+++ b/tests/ts/fdisk/mbr-dos-mode
@@ -41,7 +41,7 @@ FDISK_OPTIONS="-C 1024 -c=dos -u=cylinders"
 
 function print_layout {
        echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-       $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+       $TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
        echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }
 

diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode
index a163d776454adf6423ff6ca92f24dc069aa0ff72..d366f28ac90fe94ae83eeb87089a2d69dd53b46d 100755 (executable)
--- a/tests/ts/fdisk/mbr-nondos-mode
+++ b/tests/ts/fdisk/mbr-nondos-mode
@@ -49,7 +49,7 @@ esac
 
 function print_layout {
        echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-       $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+       $TS_CMD_FDISK -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
        echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 
        ts_fdisk_clean ${TEST_IMAGE_NAME}

diff --git a/tests/ts/fdisk/mbr-sort b/tests/ts/fdisk/mbr-sort
index 8ae51bf67e51fa0f9acdc906560c566f75780b5a..c82dc019bd9a98033c716494cac7a8035aff07ff 100755 (executable)
--- a/tests/ts/fdisk/mbr-sort
+++ b/tests/ts/fdisk/mbr-sort
@@ -40,7 +40,7 @@ FDISK_CMD_EXPERT_SORT="x\nf\nr\n"
 
 function print_layout {
        echo -ne "\n---layout----------\n" >> $TS_OUTPUT
-       $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+       $TS_CMD_FDISK -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
        echo -ne   "-------------------\n\n" >> $TS_OUTPUT
 }
 

diff --git a/tests/ts/fdisk/oddinput b/tests/ts/fdisk/oddinput
index cd125f71ea1192df0f4d55a568d33542d4c15d67..8c23abbf00f407ff40d74de4031357703dd1f43c 100755 (executable)
--- a/tests/ts/fdisk/oddinput
+++ b/tests/ts/fdisk/oddinput
@@ -35,19 +35,19 @@ ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_log "---Empty image listing" # this should report empty partition table
 # TEST_IMAGE_NAME has absolute path, and is by definition different on each computer, we need to sed it away
-$TS_CMD_FDISK -c=dos -u=cylinders -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_FDISK -c=dos -u=cylinders -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
 sed -i -e "s/${TEST_IMAGE_NAME//\//\\/}/testimage/" $TS_OUTPUT $TS_ERRLOG
 
 #
 # Errors
 #
 ts_logerr "---Nonexistent file"
-$TS_CMD_FDISK -c=dos -u=cylinders -l _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_FDISK -c=dos -u=cylinders -x _a_file_that_does_not_exist_ >> $TS_OUTPUT 2>> $TS_ERRLOG
 sed -i -e "s@$($TS_HELPER_STRERROR ENOENT)@ENOENT@" $TS_OUTPUT $TS_ERRLOG
 
 ts_logerr "---Too small file"
 echo  "This file is too small" >> oddinput.toosmall
-$TS_CMD_FDISK -c=dos -u=cylinders -l oddinput.toosmall >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_FDISK -c=dos -u=cylinders -x oddinput.toosmall >> $TS_OUTPUT 2>> $TS_ERRLOG
 sed -i -e "s@$($TS_HELPER_STRERROR EINVAL)@EINVAL@" $TS_OUTPUT $TS_ERRLOG
 rm oddinput.toosmall
 ts_finalize

diff --git a/tests/ts/fdisk/sunlabel b/tests/ts/fdisk/sunlabel
index 7f72743f40771aa00694828bb51f4aa05ba9caeb..8f75b692af01d43e164e4b538e8c7bb3abcc751b 100755 (executable)
--- a/tests/ts/fdisk/sunlabel
+++ b/tests/ts/fdisk/sunlabel
@@ -46,42 +46,42 @@ echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETEALL}${FDISK_CMD_WRITE_CLOSE}" \
         | $TS_CMD_FDISK --noauto-pt ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+$TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 
 ts_log "Create first partition"
 echo -e "${FDISK_CMD_CREATE_PRIMARY}${FDISK_CMD_WRITE_CLOSE}" | \
        $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+$TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 
 ts_log "Set partition sysid"
 echo -e "${FDISK_CMD_CHANGE_SYSID}${FDISK_CMD_WRITE_CLOSE}" | \
        $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+$TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 
 ts_log "Set first partition readonly"
 echo -e "${FDISK_CMD_TOGGLE_READONLY}${FDISK_CMD_WRITE_CLOSE}" | \
        $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+$TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 
 ts_log "Set first partition mountable"
 echo -e "${FDISK_CMD_TOGGLE_MOUNTABLE}${FDISK_CMD_WRITE_CLOSE}" | \
        $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+$TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 
 ts_log "Create second partition"
 echo -e "${FDISK_CMD_CREATE_SECONDARY}${FDISK_CMD_WRITE_CLOSE}" | \
        $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
+$TS_CMD_FDISK ${FDISK_OPTIONS} -x ${TEST_IMAGE_NAME} >> $TS_OUTPUT
 
 ts_log "Delete all partitions"
 echo -e "${FDISK_CMD_DELETEALL}${FDISK_CMD_WRITE_CLOSE}" | \