tests: refresh fdisk outputs

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole
index f0b3e81b3b95a06f6383eea9503999af9d17f4e4..83fbff356c91562cf3aa5cde320bb802bb511189 100644 (file)
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -7,20 +7,17 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-204543, default 204543): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-204543, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-204543, default 204543): 
 Created a new <removed>.
 
@@ -31,12 +28,11 @@ I/O size (minimum/optimal): 65536 bytes / 131072 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-<removed>p1           2048     22527  10240  83 Linux
-<removed>p2          22528    204543  91008  83 Linux
+Device     Boot Start    End Sectors  Size Id Type
+<removed>p1       2048  22527   20480   10M 83 Linux
+<removed>p2      22528 204543  182016 88.9M 83 Linux
 
-Command (m for help): 
-The partition table has been altered.
+Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
 

diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index 7b206cf66a854446fc3f4759102105cad665a6ab..8f73a694e7de8d4084a9465b98265dfe76d27497 100644 (file)
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -5,20 +5,17 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-104447, default 104447): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (53248-104447, default 53248): Last sector, +sectors or +size{K,M,G,T,P} (53248-104447, default 104447): 
 Created a new <removed>.
 
@@ -29,12 +26,11 @@ I/O size (minimum/optimal): 512 bytes / 32768 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-<removed>1           2048     53247  25600  83 Linux
-<removed>2          53248    104447  25600  83 Linux
+Device     Boot Start    End Sectors Size Id Type
+<removed>1        2048  53247   51200  25M 83 Linux
+<removed>2       53248 104447   51200  25M 83 Linux
 
-Command (m for help): 
-The partition table has been altered.
+Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
 

diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index 6a0333fb3cb2752be651bce46bcec3bf450a08d5..6f93f54de385a36db5a6a86bc5c3e49416fab87b 100644 (file)
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -7,20 +7,17 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102271, default 102271): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-102271, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102271, default 102271): 
 Created a new <removed>.
 
@@ -31,12 +28,11 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-/dev/md8p1           2048     22527  10240  83 Linux
-/dev/md8p2          22528     43007  10240  83 Linux
+Device     Boot Start   End Sectors Size Id Type
+/dev/md8p1       2048 22527   20480  10M 83 Linux
+/dev/md8p2      22528 43007   20480  10M 83 Linux
 
-Command (m for help): 
-The partition table has been altered.
+Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
 

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 08da6a20bcfb2c4b8df1a3d42179a0ca5068d5ed..49f93751df7d4b7f81c397598d8fb1b6bd0f08ee 100644 (file)
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -5,34 +5,29 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default e): 
 Selected partition 4
 First sector (63488-102399, default 63488): Last sector, +sectors or +size{K,M,G,T,P} (63488-102399, default 102399): 
@@ -60,17 +55,16 @@ I/O size (minimum/optimal): 4096 bytes / 32768 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-<removed>1           2048     22527  10240  83 Linux
-<removed>2          22528     43007  10240  83 Linux
-<removed>3          43008     63487  10240  83 Linux
-<removed>4          63488    102399  19456   5 Extended
-<removed>5          65536     75775   5120  83 Linux
-<removed>6          77824     88063   5120  83 Linux
-<removed>7          90112    102399   6144  83 Linux
+Device     Boot Start    End Sectors Size Id Type
+<removed>1        2048  22527   20480  10M 83 Linux
+<removed>2       22528  43007   20480  10M 83 Linux
+<removed>3       43008  63487   20480  10M 83 Linux
+<removed>4       63488 102399   38912  19M  5 Extended
+<removed>5       65536  75775   10240   5M 83 Linux
+<removed>6       77824  88063   10240   5M 83 Linux
+<removed>7       90112 102399   12288   6M 83 Linux
 
-Command (m for help): 
-The partition table has been altered.
+Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
 

diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index f2515ac78d6d860da1e0262b65f9603ab1df4502..6e44cfe2bb7402a269d474c3bb5bb9c156356717 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -5,34 +5,29 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (7-102399, default 7): Last sector, +sectors or +size{K,M,G,T,P} (7-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (20487-102399, default 20487): Last sector, +sectors or +size{K,M,G,T,P} (20487-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (3,4, default 3): First sector (40967-102399, default 40967): Last sector, +sectors or +size{K,M,G,T,P} (40967-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default e): 
 Selected partition 4
 First sector (61447-102399, default 61447): Last sector, +sectors or +size{K,M,G,T,P} (61447-102399, default 102399): 
@@ -61,17 +56,16 @@ Alignment offset: 3584 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-<removed>1              7     20486  10240  83 Linux
-<removed>2          20487     40966  10240  83 Linux
-<removed>3          40967     61446  10240  83 Linux
-<removed>4          61447    102399  20476+  5 Extended
-<removed>5          63487     73726   5120  83 Linux
-<removed>6          75775     86014   5120  83 Linux
-<removed>7          88063    102399   7168+ 83 Linux
+Device     Boot Start    End Sectors Size Id Type
+<removed>1           7  20486   20480  10M 83 Linux
+<removed>2       20487  40966   20480  10M 83 Linux
+<removed>3       40967  61446   20480  10M 83 Linux
+<removed>4       61447 102399   40953  20M  5 Extended
+<removed>5       63487  73726   10240   5M 83 Linux
+<removed>6       75775  86014   10240   5M 83 Linux
+<removed>7       88063 102399   14337   7M 83 Linux
 
-Command (m for help): 
-The partition table has been altered.
+Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
 

diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 03ebcccd55bcae5bc6ce3e665126e7286044519e..317865a86c47be9c10846330af7db1ab257c7b38 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -5,20 +5,17 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): 
 Created a new <removed>.
 
@@ -29,12 +26,11 @@ I/O size (minimum/optimal): 4096 bytes / 32768 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-<removed>1           2048     43007  20480  83 Linux
-<removed>2          43008    102399  29696  83 Linux
+Device     Boot Start    End Sectors Size Id Type
+<removed>1        2048  43007   40960  20M 83 Linux
+<removed>2       43008 102399   59392  29M 83 Linux
 
-Command (m for help): 
-The partition table has been altered.
+Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
 
@@ -48,20 +44,17 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-100095, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-100095, default 100095): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-100095, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-100095, default 100095): 
 Created a new <removed>.
 
@@ -72,12 +65,11 @@ I/O size (minimum/optimal): 65536 bytes / 131072 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-<removed>p1           2048     22527  10240  83 Linux
-<removed>p2          22528     43007  10240  83 Linux
+Device     Boot Start   End Sectors Size Id Type
+<removed>p1       2048 22527   20480  10M 83 Linux
+<removed>p2      22528 43007   20480  10M 83 Linux
 
-Command (m for help): 
-The partition table has been altered.
+Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.
 

diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index 498fc6560643b4b03f4f5eff3ad02820b54ec633..27df5705135be1ee6d0f37b5d5150012d77ba98f 100644 (file)
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -5,34 +5,29 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default e): 
 Selected partition 4
 First sector (63488-102399, default 63488): Last sector, +sectors or +size{K,M,G,T,P} (63488-102399, default 102399): 
@@ -60,13 +55,13 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-<removed>p1           2048     22527  10240  83 Linux
-<removed>p2          22528     43007  10240  83 Linux
-<removed>p3          43008     63487  10240  83 Linux
-<removed>p4          63488    102399  19456   5 Extended
-<removed>p5          65536     75775   5120  83 Linux
-<removed>p6          77824     88063   5120  83 Linux
-<removed>p7          90112    102399   6144  83 Linux
+Device     Boot Start    End Sectors Size Id Type
+<removed>p1       2048  22527   20480  10M 83 Linux
+<removed>p2      22528  43007   20480  10M 83 Linux
+<removed>p3      43008  63487   20480  10M 83 Linux
+<removed>p4      63488 102399   38912  19M  5 Extended
+<removed>p5      65536  75775   10240   5M 83 Linux
+<removed>p6      77824  88063   10240   5M 83 Linux
+<removed>p7      90112 102399   12288   6M 83 Linux
 
 Command (m for help): 

diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 7f4f851db456ebebcaeb0a4fbc0a1ab87d4b2afa..8ae0c4057233c0c8a7562e0c432dc601a9cea9bb 100644 (file)
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -5,34 +5,29 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): 
 Created a new <removed>.
 
-Command (m for help): 
-Partition type:
+Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
-   e   extended
+   e   extended (container for logical partitions)
 Select (default e): 
 Selected partition 4
 First sector (63488-102399, default 63488): Last sector, +sectors or +size{K,M,G,T,P} (63488-102399, default 102399): 
@@ -60,17 +55,16 @@ I/O size (minimum/optimal): 512 bytes / 32768 bytes
 Disklabel type: dos
 Disk identifier: <removed>
 
-Device     Boot     Start       End Blocks  Id System
-<removed>1           2048     22527  10240  83 Linux
-<removed>2          22528     43007  10240  83 Linux
-<removed>3          43008     63487  10240  83 Linux
-<removed>4          63488    102399  19456   5 Extended
-<removed>5          65536     75775   5120  83 Linux
-<removed>6          77824     88063   5120  83 Linux
-<removed>7          90112    102399   6144  83 Linux
+Device     Boot Start    End Sectors Size Id Type
+<removed>1        2048  22527   20480  10M 83 Linux
+<removed>2       22528  43007   20480  10M 83 Linux
+<removed>3       43008  63487   20480  10M 83 Linux
+<removed>4       63488 102399   38912  19M  5 Extended
+<removed>5       65536  75775   10240   5M 83 Linux
+<removed>6       77824  88063   10240   5M 83 Linux
+<removed>7       90112 102399   12288   6M 83 Linux
 
-Command (m for help): 
-The partition table has been altered.
+Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
 Syncing disks.