tests: cleanup fdisk based stuff

* use fdisk --noauto-pt to avoid re-creation of the default architecture specific PT
* use more verbose "Created a new" messages in the output

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 cc0b17f83e656fb2a32a208e7f3b81a9c4cc31d1..5ef99b64505753256be648567131caa02424c281 100644 (file)
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -11,13 +11,13 @@ Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 99.9 MiB, 104726528 bytes, 204544 sectors
 Units: sectors of 1 * 512 = 512 bytes

diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index b568edbd11f78b8697358b9925560c7a0459a7d1..684198827449313b8d078b4571ed176cb09383ab 100644 (file)
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -5,19 +5,20 @@ 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): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 51 MiB, 53477376 bytes, 104448 sectors
 Disk model: scsi_debug      

diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index 6334ae114957456f8ff9775704f18fb7baedb04b..60d3b877df628ef34e35e3eb824c23307b9637ac 100644 (file)
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -11,13 +11,13 @@ Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Disk /dev/md8: 49.96 MiB, 52363264 bytes, 102272 sectors
 Units: sectors of 1 * 512 = 512 bytes

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index e6aa145c9de67fc48b3b7beec4aebc60adc603bd..ec066136a31da240f24ed26e303fd276edd06a87 100644 (file)
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -5,25 +5,26 @@ 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): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
@@ -31,22 +32,22 @@ Command (m for help): Partition type
 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): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 5
 First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 6
 First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 7
 First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      

diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 831e7dc9898f6146dc2646c5fe52d60a84261674..f7a0c9f6e88b3b3d99f874a60e5c12eb6cd2f297 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -5,25 +5,26 @@ 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): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
@@ -31,22 +32,22 @@ Command (m for help): Partition type
 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): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 5
 First sector (61454-102399, default 63487): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63487-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 6
 First sector (61454-102399, default 75775): Last sector, +/-sectors or +/-size{K,M,G,T,P} (75775-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 7
 First sector (61454-102399, default 88063): Last sector, +/-sectors or +/-size{K,M,G,T,P} (88063-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      

diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index ce9b3e7e91ccc70db7dd28b4a4d637126fffb57a..e6ccea5ccafe75a1f754b09e2cc49e102dddd5f3 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -5,19 +5,20 @@ 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): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (51199-102399, default 51200): Last sector, +/-sectors or +/-size{K,M,G,T,P} (51200-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      
@@ -45,19 +46,19 @@ 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>.
+Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-97791, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-97791, default 97791): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-97791, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-97791, default 97791): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 47.77 MiB, 50069504 bytes, 97792 sectors
 Units: sectors of 1 * 512 = 512 bytes

diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index 083641f47197978ae368ef2f96f375fc8cb23f83..782beca54dcdb99395a4515e7952270b2ea3b460 100644 (file)
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -5,25 +5,26 @@ 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): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
@@ -31,22 +32,22 @@ Command (m for help): Partition type
 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): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 5
 First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 6
 First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 7
 First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Units: sectors of 1 * 512 = 512 bytes

diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 65420b6b923fda7d62564c4f7a932278e130afcc..2ca98930c46c4645d7f5cb6bfcf4efe6e8ca02bc 100644 (file)
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -5,25 +5,26 @@ 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): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
    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>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
@@ -31,22 +32,22 @@ Command (m for help): Partition type
 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): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 5
 First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 6
 First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 7
 First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      

diff --git a/tests/expected/fdisk/gpt-resize b/tests/expected/fdisk/gpt-resize
index 01e220e43dc2bd817709960be6e381ea34904e4c..64b6c431d9a64251c2f0692975ee56d0ab89069f 100644 (file)
--- a/tests/expected/fdisk/gpt-resize
+++ b/tests/expected/fdisk/gpt-resize
@@ -3,8 +3,8 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>p1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>p1: Created a new partition <removed>.
 <removed>p2: Done.
 
 New situation:
@@ -23,7 +23,7 @@ Be careful before using the write command.
 
 
 Command (m for help): Partition number (2-128, default 2): First sector (20447-40926, default 20480): Last sector, +/-sectors or +/-size{K,M,G,T,P} (20480-40926, default 40926): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.

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 4efd2a28712eb1da56cea6243320686115e22b73..d5c5f45ed0dee4ef6e9e922894d62737131ad439 100644 (file)
--- a/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end
+++ b/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end
@@ -24,7 +24,7 @@ Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (2048-19999, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-19999, default 19999): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): The partition table has been altered.
 Syncing disks.

diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel
index 5ada4fab1e11e065dc9762346dbb4f1c95507e2a..33bdad167555d4fc36fabf7fb9e2e5bc154ae463 100644 (file)
--- a/tests/expected/fdisk/sunlabel
+++ b/tests/expected/fdisk/sunlabel
@@ -60,7 +60,7 @@ Be careful before using the write command.
 
 
 Command (m for help): Partition number (2-8, default 2): First cylinder (128-325, default 128): Last cylinder or +/-cylinders or +/-size{K,M,G,T,P} (128-325, default 325): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): The partition table has been altered.
 Syncing disks.

diff --git a/tests/expected/libfdisk/gpt-all-defaults b/tests/expected/libfdisk/gpt-all-defaults
index ccc185cd3aa0e64fe114d2dcb597be5ea53fa2cb..6351f25de7136992ba6ed703fbc03735f91fd7f8 100644 (file)
--- a/tests/expected/libfdisk/gpt-all-defaults
+++ b/tests/expected/libfdisk/gpt-all-defaults
@@ -7,9 +7,9 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
 <removed>3: Done.
 
 New situation:

diff --git a/tests/expected/libfdisk/gpt-all-defaults-with-typo b/tests/expected/libfdisk/gpt-all-defaults-with-typo
index ccc185cd3aa0e64fe114d2dcb597be5ea53fa2cb..6351f25de7136992ba6ed703fbc03735f91fd7f8 100644 (file)
--- a/tests/expected/libfdisk/gpt-all-defaults-with-typo
+++ b/tests/expected/libfdisk/gpt-all-defaults-with-typo
@@ -7,9 +7,9 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
 <removed>3: Done.
 
 New situation:

diff --git a/tests/expected/libfdisk/mkpart-full-gpt b/tests/expected/libfdisk/mkpart-full-gpt
index 7740454fd3006fe97cf05e47f1e4463d335d7d20..8e78a27cfc40cef1dce9a83756e321ea38c5938d 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-gpt
+++ b/tests/expected/libfdisk/mkpart-full-gpt
@@ -1,18 +1,18 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=10240,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=5,start=12288,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=6,start=14336,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
index 3d912ed5dbce56a4a9a4b8a7357f09484b1155b2..531606e864b2dbd6168d1046ec1cffdf6f069d8a 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
+++ b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
@@ -1,10 +1,10 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=5000,size=2048>
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-gpt-nopartno b/tests/expected/libfdisk/mkpart-full-gpt-nopartno
index fc9fdf2407134bc97577d290889e733eb19e2ebf..c038c37feeb36c1c9b86be0ac337583503c0bda0 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-gpt-nopartno
+++ b/tests/expected/libfdisk/mkpart-full-gpt-nopartno
@@ -1,18 +1,18 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=<default>,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=10240,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=12288,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=14336,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-gpt-partno-gap b/tests/expected/libfdisk/mkpart-full-gpt-partno-gap
index 3a65d37e42a145af0b03913a99442a595718c1df..a636e281e4dba6d4be81d0371173e9dee54970a4 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-gpt-partno-gap
+++ b/tests/expected/libfdisk/mkpart-full-gpt-partno-gap
@@ -1,18 +1,18 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=6,start=10240,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=7,start=12288,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=8,start=14336,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-gpt-space-gap b/tests/expected/libfdisk/mkpart-full-gpt-space-gap
index 64b2da4ab22df982737eb85e76446b48179c7c19..5dcdb77f91a399d7a7cfe45c9572978e054738b9 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-gpt-space-gap
+++ b/tests/expected/libfdisk/mkpart-full-gpt-space-gap
@@ -1,14 +1,14 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=12288,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=14336,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-logical b/tests/expected/libfdisk/mkpart-full-mbr-err-logical
index a08070ea3f9cca0b69e7bfd153fed926275141d4..f8e9b7d9f9ccaafec54194808ada014645de6a0a 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-logical
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-logical
@@ -1,15 +1,15 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=10240,size=2048>
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=5,start=4096,size=2048>
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
index 3a1cd636cdc3c4fb4afcc1740198d9a6c539d41e..e8aff295f0bcd55c800e95b99cd0a2f0b4b0b960 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
@@ -1,8 +1,8 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=4096,size=2048>
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-primary b/tests/expected/libfdisk/mkpart-full-mbr-err-primary
index 57fcc5c3f431fd525661e33c65b9f51fa3702eab..32007512dc20a1b72172c03605f8fd223be7460f 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-primary
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-primary
@@ -1,8 +1,8 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=6,start=6144,size=2048>
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-logical b/tests/expected/libfdisk/mkpart-full-mbr-logical
index ff2611cbb24ff99b7ea05869d0e470680086bd07..d3d27cb38d3acde8ec00e6c94fd1774a0f308487 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-logical
+++ b/tests/expected/libfdisk/mkpart-full-mbr-logical
@@ -1,21 +1,21 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=10240,size=2048>
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=5,start=14336,size=2048>
 Adding logical partition 6
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=6,start=18432,size=12288>
 Adding logical partition 7
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-nopartno b/tests/expected/libfdisk/mkpart-full-mbr-nopartno
index c8c449cd1bc1c7ff5620f3965bea9800fa92f86c..51aa5a7f245b0a2c3fd68b8c660d0f63b8b3a665 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-nopartno
+++ b/tests/expected/libfdisk/mkpart-full-mbr-nopartno
@@ -1,21 +1,21 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=<default>,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=10240,size=2048>
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=14336,size=2048>
 Adding logical partition 6
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=18432,size=12288>
 Adding logical partition 7
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-primary b/tests/expected/libfdisk/mkpart-full-mbr-primary
index c71ec9e1fa49e0da0f32447a4bfe21101686a79f..cd3604ffea39db877583b41bc4b110be31a05cba 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-primary
+++ b/tests/expected/libfdisk/mkpart-full-mbr-primary
@@ -1,12 +1,12 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-primary-nopartno b/tests/expected/libfdisk/mkpart-full-mbr-primary-nopartno
index 33ba9ff88090e6d3d9f1c8e5f5c103d9b5cc4b64..a8b5819dfaab4624fc8333f7628228a5d0422be3 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-primary-nopartno
+++ b/tests/expected/libfdisk/mkpart-full-mbr-primary-nopartno
@@ -1,12 +1,12 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=<default>,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-full-mbr-space-gap b/tests/expected/libfdisk/mkpart-full-mbr-space-gap
index 881ea9ec74f2f01221292915335448f9f667a842..1fe0061828f021864f8a1d9dc00101583dc51d0e 100644 (file)
--- a/tests/expected/libfdisk/mkpart-full-mbr-space-gap
+++ b/tests/expected/libfdisk/mkpart-full-mbr-space-gap
@@ -1,10 +1,10 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-gpt b/tests/expected/libfdisk/mkpart-gpt
index 3634695f977a009a2f0ed688d4540af25833fef8..fab28b1ce6ba4a8b48f1e8062d530aa4e587ae53 100644 (file)
--- a/tests/expected/libfdisk/mkpart-gpt
+++ b/tests/expected/libfdisk/mkpart-gpt
@@ -1,11 +1,11 @@
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
+Created a new disklabel.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-mbr b/tests/expected/libfdisk/mkpart-mbr
index 0212000e32c8a4d48fc1860ce4cd4841af4f684c..883efd7833a28f19a411636baaf898313e3386ea 100644 (file)
--- a/tests/expected/libfdisk/mkpart-mbr
+++ b/tests/expected/libfdisk/mkpart-mbr
@@ -1,8 +1,8 @@
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
+Created a new disklabel.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-mbr-logic b/tests/expected/libfdisk/mkpart-mbr-logic
index 178eaf2f23941ef906dc7d72b969f6c760a076ed..eddaef0f1728d00f68eaae6cbd18b45b38c0df14 100644 (file)
--- a/tests/expected/libfdisk/mkpart-mbr-logic
+++ b/tests/expected/libfdisk/mkpart-mbr-logic
@@ -1,14 +1,14 @@
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
+Created a new disklabel.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Adding logical partition 6
-Created a new <removed>.
+Created a new partition <removed>.
 Adding logical partition 7
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/libfdisk/mkpart-mbr-nopartno b/tests/expected/libfdisk/mkpart-mbr-nopartno
index 178eaf2f23941ef906dc7d72b969f6c760a076ed..eddaef0f1728d00f68eaae6cbd18b45b38c0df14 100644 (file)
--- a/tests/expected/libfdisk/mkpart-mbr-nopartno
+++ b/tests/expected/libfdisk/mkpart-mbr-nopartno
@@ -1,14 +1,14 @@
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
+Created a new disklabel.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Adding logical partition 6
-Created a new <removed>.
+Created a new partition <removed>.
 Adding logical partition 7
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes

diff --git a/tests/expected/sfdisk/dos-dump-gaps b/tests/expected/sfdisk/dos-dump-gaps
index 26a6e93f2c315d88cf775eadcc6f4e058c640f69..ee473e6ebd2a2f2086da22721b9803d53c108e8f 100644 (file)
--- a/tests/expected/sfdisk/dos-dump-gaps
+++ b/tests/expected/sfdisk/dos-dump-gaps
@@ -7,10 +7,10 @@ Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Ignoring partition.
-<removed>3: Created a new <removed>.
+<removed>3: Created a new partition <removed>.
 <removed>4: Ignoring partition.
 <removed>5: Done.
 

diff --git a/tests/expected/sfdisk/dos-dump-old b/tests/expected/sfdisk/dos-dump-old
index eb0cc114f195ac160b68c29fed6a9bd4e9314151..83f5bdd6307e8915f0b5a292d958bb2d6960cf58 100644 (file)
--- a/tests/expected/sfdisk/dos-dump-old
+++ b/tests/expected/sfdisk/dos-dump-old
@@ -7,8 +7,8 @@ Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Ignoring partition.
 <removed>3: Ignoring partition.
 <removed>4: Ignoring partition.

diff --git a/tests/expected/sfdisk/dos-explicit-size b/tests/expected/sfdisk/dos-explicit-size
index 70f1ba7981871f7c743949ae63b98b33bc4bc435..20f421c410806c69243283838baa09b11430ef9c 100644 (file)
--- a/tests/expected/sfdisk/dos-explicit-size
+++ b/tests/expected/sfdisk/dos-explicit-size
@@ -7,14 +7,14 @@ Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
-<removed>6: Created a new <removed>.
-<removed>7: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
+<removed>6: Created a new partition <removed>.
+<removed>7: Created a new partition <removed>.
 <removed>8: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/dos-read-dump b/tests/expected/sfdisk/dos-read-dump
index b4f24491bb208d5c34633d412c378d953897fe33..a0b0b77ca29a64a260af065a5d63b3b60566a30c 100644 (file)
--- a/tests/expected/sfdisk/dos-read-dump
+++ b/tests/expected/sfdisk/dos-read-dump
@@ -8,13 +8,13 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
-<removed>6: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
+<removed>6: Created a new partition <removed>.
 <removed>7: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/dos-read-dump-case b/tests/expected/sfdisk/dos-read-dump-case
index a6fc3f25792feb037e56368362f9b7873270bbc0..3486cb2027e2d4a27430922fa2df865eebf7601c 100644 (file)
--- a/tests/expected/sfdisk/dos-read-dump-case
+++ b/tests/expected/sfdisk/dos-read-dump-case
@@ -8,8 +8,8 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/dos-simple-commas b/tests/expected/sfdisk/dos-simple-commas
index ea69e0dc94cd3cd7923150a8720f11fd1a6ce1e0..b44be4157dd76c7fda7f33d6c302bb390b5ee973 100644 (file)
--- a/tests/expected/sfdisk/dos-simple-commas
+++ b/tests/expected/sfdisk/dos-simple-commas
@@ -6,13 +6,13 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
-<removed>6: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
+<removed>6: Created a new partition <removed>.
 <removed>7: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/dos-simple-space b/tests/expected/sfdisk/dos-simple-space
index 858ddc9eaeef9017125884f3c4e4aa2bf801ee69..1e22e9a09eb2ceb1fa06ecebf317ab5eea6aa39b 100644 (file)
--- a/tests/expected/sfdisk/dos-simple-space
+++ b/tests/expected/sfdisk/dos-simple-space
@@ -6,10 +6,10 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
 <removed>4: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/dump-current b/tests/expected/sfdisk/dump-current
index 9a14bf959c96ed5166cd055d71fcd432c8045d70..86b3f40a7433b88b6030a1660537fddc8007ee95 100644 (file)
--- a/tests/expected/sfdisk/dump-current
+++ b/tests/expected/sfdisk/dump-current
@@ -13,11 +13,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/dump-v2.32 b/tests/expected/sfdisk/dump-v2.32
index bd19fc420547f93e3d9f51a310d72af353050c1c..2c62295c6ceb3c86f7de1c4712751fa0729078ca 100644 (file)
--- a/tests/expected/sfdisk/dump-v2.32
+++ b/tests/expected/sfdisk/dump-v2.32
@@ -12,11 +12,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/dump-v2.35 b/tests/expected/sfdisk/dump-v2.35
index 9a14bf959c96ed5166cd055d71fcd432c8045d70..86b3f40a7433b88b6030a1660537fddc8007ee95 100644 (file)
--- a/tests/expected/sfdisk/dump-v2.35
+++ b/tests/expected/sfdisk/dump-v2.35
@@ -13,11 +13,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/gpt-all-defaults b/tests/expected/sfdisk/gpt-all-defaults
index b654dd7bcb0fd7243f8da00f8280a1276c04f933..55eb256a9e7be6223cf841fccfbf0986fcb3565b 100644 (file)
--- a/tests/expected/sfdisk/gpt-all-defaults
+++ b/tests/expected/sfdisk/gpt-all-defaults
@@ -8,12 +8,12 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
 <removed>6: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/gpt-read-dump b/tests/expected/sfdisk/gpt-read-dump
index 60d9922229b357009669f0b78e61a30e1c2078b4..a35f2d4ccfa43dba189982045eb9f8f87e934525 100644 (file)
--- a/tests/expected/sfdisk/gpt-read-dump
+++ b/tests/expected/sfdisk/gpt-read-dump
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/gpt-reorder b/tests/expected/sfdisk/gpt-reorder
index ff0ef074377a6cc78ce1e2126dc5ac07cbaa45e8..d4c430690e96e7a2a4d761bb2d509e126b1f75f5 100644 (file)
--- a/tests/expected/sfdisk/gpt-reorder
+++ b/tests/expected/sfdisk/gpt-reorder
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/resize-dos-unsorted b/tests/expected/sfdisk/resize-dos-unsorted
index 49133bb12254ba97b43a12cef97b9e59f98b6712..a16c3261e45390ce6110cb430ee6bbe7d925a5fc 100644 (file)
--- a/tests/expected/sfdisk/resize-dos-unsorted
+++ b/tests/expected/sfdisk/resize-dos-unsorted
@@ -8,13 +8,13 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
-<removed>6: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
+<removed>6: Created a new partition <removed>.
 <removed>7: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/script-quotes b/tests/expected/sfdisk/script-quotes
index e38b8395ce6bef6cdc7f13d36a20b82634a17cb4..5ae4d4fc50c03dfb469cfb931e3860d3a3327f3e 100644 (file)
--- a/tests/expected/sfdisk/script-quotes
+++ b/tests/expected/sfdisk/script-quotes
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/script-separator b/tests/expected/sfdisk/script-separator
index db2f2c423b59c1293014e976797f7a117a7ccb6c..0ac5453472a46de072e9404a81a51864d7e32575 100644 (file)
--- a/tests/expected/sfdisk/script-separator
+++ b/tests/expected/sfdisk/script-separator
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/script-type-and-id b/tests/expected/sfdisk/script-type-and-id
index c834f2290a957c0094253710744087fc26a364de..ee6dc555ed50509d2c9b0eee700847604fdc573b 100644 (file)
--- a/tests/expected/sfdisk/script-type-and-id
+++ b/tests/expected/sfdisk/script-type-and-id
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos
index 317bbfb450873da2f91452ee4536adfcdedceb1d..8f97e25e553431c9073bea23bbcf55b8059916ae 100644 (file)
--- a/tests/expected/sfdisk/wipe-fs-to-dos
+++ b/tests/expected/sfdisk/wipe-fs-to-dos
@@ -9,9 +9,9 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
+>>> Created a new disklabel.
 
-<removed>1: Created a new <removed>.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos b/tests/expected/sfdisk/wipe-gpt-to-dos
index 1c90e956cf319bae6fc1f5f55c0e9d7501b8917a..de7cd6298d552f1f0a939d895f43361f00fa8676 100644 (file)
--- a/tests/expected/sfdisk/wipe-gpt-to-dos
+++ b/tests/expected/sfdisk/wipe-gpt-to-dos
@@ -6,8 +6,8 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
@@ -33,8 +33,8 @@ Old situation:
 Device             Start    End Sectors Size Type
 <removed>1   2048 102366  100319  49M Linux filesystem
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos-auto b/tests/expected/sfdisk/wipe-gpt-to-dos-auto
index ca060a8a61400822e235976d1beac1e56cf86344..d6c075fff7ffe761964471bc270afcf253bdb2e6 100644 (file)
--- a/tests/expected/sfdisk/wipe-gpt-to-dos-auto
+++ b/tests/expected/sfdisk/wipe-gpt-to-dos-auto
@@ -13,8 +13,8 @@ Old situation:
 Device     Boot Start    End Sectors Size Id Type
 <removed>1        2048 102399  100352  49M 83 Linux
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
@@ -40,8 +40,8 @@ Old situation:
 Device             Start    End Sectors Size Type
 <removed>1   2048 102366  100319  49M Linux filesystem
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:

diff --git a/tests/expected/sfdisk/wipe-partition b/tests/expected/sfdisk/wipe-partition
index 9d608ae74f68d1f2a7fa740a8374c332bc499eb4..dc5e5fceab7d65a2da071b419fdc5a300585192a 100644 (file)
--- a/tests/expected/sfdisk/wipe-partition
+++ b/tests/expected/sfdisk/wipe-partition
@@ -6,8 +6,8 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
@@ -32,8 +32,8 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 The signature will be removed by a write command.
 <removed>2: Done.
 

diff --git a/tests/functions.sh b/tests/functions.sh
index 0af8b96b77f9a7527baa95013d5224bbabd1b054..60bef734ef19dabcbda4af0e4f07febd2cce8f99 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -770,7 +770,8 @@ function ts_fdisk_clean {
 
        sed -i \
                -e 's/Disk identifier:.*/Disk identifier: <removed>/' \
-               -e 's/Created a new.*/Created a new <removed>./' \
+               -e 's/Created a new partition.*/Created a new partition <removed>./' \
+               -e 's/Created a new .* disklabel .*/Created a new disklabel./' \
                -e 's/^Device[[:blank:]]*Start/Device             Start/' \
                -e 's/^Device[[:blank:]]*Boot/Device     Boot/' \
                -e 's/Welcome to fdisk.*/Welcome to fdisk <removed>./' \

diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole
index d2f780bdb9a1073cc1a6aa706b3730b9ccf96d2c..c78f774dd6ce39a157bdf0476911fbd5f4d7fdd7 100755 (executable)
--- a/tests/ts/blkid/md-raid0-whole
+++ b/tests/ts/blkid/md-raid0-whole
@@ -51,7 +51,7 @@ mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=0 \
            --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 # create dos partition table
-$TS_CMD_FDISK ${MD_DEVICE} &>/dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${MD_DEVICE} &>/dev/null <<EOF
 o
 w
 q

diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index a72fde7d18ba1d8b6c0aad3df852c9b326d0733f..0f231fefb74ff145f92f2711828fcfccae0924b2 100755 (executable)
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -34,7 +34,8 @@ TS_KNOWN_FAIL="yes"   # due to recent changes in mdadm
 ts_scsi_debug_init dev_size_mb=51 sector_size=512
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1

diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 97105e8ca1d2004000f6a74cd0319ce1ef887421..771aab794924863b20d46a0c54b2e67ac3bd6228 100755 (executable)
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -54,7 +54,7 @@ mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
 udevadm settle
 
 # create dos partition table
-$TS_CMD_FDISK ${MD_DEVICE} &>/dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${MD_DEVICE} &>/dev/null <<EOF
 o
 w
 q

diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index 00d24c11d319d1aedde7ed441e8c59162ada36b3..c12d06997fc2271249dd50d901b992121e5409c9 100755 (executable)
--- a/tests/ts/eject/umount
+++ b/tests/ts/eject/umount
@@ -34,7 +34,7 @@ function init_partitions {
        local dev=$1
 
        ts_log "Create partitions"
-       $TS_CMD_FDISK $dev >> /dev/null 2>&1 <<EOF
+       $TS_CMD_FDISK --noauto-pt $dev >> /dev/null 2>&1 <<EOF
 o
 n
 p

diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index b6e695f985a8cb39ce3bdbce477c6f8b36992ccb..88e99cbd881606dfe035d255f5d7c9e47cbba66d 100755 (executable)
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -35,7 +35,8 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1

diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index e6a4af76bee93fc159e5cf794b619b10827db23b..325a5d47bcb4dbb66eb0a9bf090f76f3dd655851 100755 (executable)
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -35,7 +35,8 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=7
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1

diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index 2882ca4027b39d322a39e943de599912f115f9bd..4604976807e959dec5eafdc77f137d19b04e5f1e 100755 (executable)
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -38,7 +38,8 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1

diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512
index 94a4c1fc8dda7ea11a8c969705ea025d06421c7c..cda13211a7e2002d52649058b4cbc51e708ff555 100755 (executable)
--- a/tests/ts/fdisk/align-512-512
+++ b/tests/ts/fdisk/align-512-512
@@ -34,7 +34,8 @@ ts_device_init 50
 DEVICE=$TS_LODEV
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1

diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 48044684b0b44d363be9b817600cda5712fa5471..3ccb1a9007b51905ef54d51c496989704390f1a9 100755 (executable)
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -35,7 +35,8 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1

diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index 0444042a8423805394deb13dc42d11a42081e499..27cd87fe71b6c044e335eb32819ee8d6552580c7 100755 (executable)
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -93,7 +93,7 @@ $TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_SETID}${FDISK_CMD_WRITE_CLOSE}" \
-        | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+        | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
 $TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 print_layout

diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt
index ee8d83f1bce08dec20a3a320550572ec07643abd..83fe34248ee42ad553d93f20cb6c453171577e48 100755 (executable)
--- a/tests/ts/fdisk/gpt
+++ b/tests/ts/fdisk/gpt
@@ -45,7 +45,7 @@ TEST_IMAGE_NAME=$(ts_image_init 10)
 
 ts_log "Create new GPT partition table"
 echo -e "${FDISK_CMD_CREATE_GPTLABEL}${FDISK_CMD_WRITE_CLOSE}" \
-        | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+        | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
 
 print_layout
 

diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode
index 13be20b7d990a76cb1533b6a92acbf2492c1ecf6..4e62cb211d35fb9611eae5a7de90fd5c6f81d673 100755 (executable)
--- a/tests/ts/fdisk/mbr-dos-mode
+++ b/tests/ts/fdisk/mbr-dos-mode
@@ -55,7 +55,7 @@ ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
-        | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
+        | $TS_CMD_FDISK --noauto-pt ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 print_layout

diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode
index 5f469623e65200602a71db00ad4d73f4fb966769..a163d776454adf6423ff6ca92f24dc069aa0ff72 100755 (executable)
--- a/tests/ts/fdisk/mbr-nondos-mode
+++ b/tests/ts/fdisk/mbr-nondos-mode
@@ -65,8 +65,8 @@ ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 # need to run init twice, to change system ID after new label, otherwise system
 # ID will be random and will screw up md5's
 ts_log "Create new DOS partition table"
-echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
-        | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
+        | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 print_layout
 ts_finalize_subtest

diff --git a/tests/ts/fdisk/mbr-sort b/tests/ts/fdisk/mbr-sort
index 2cdb11557a29d4e56a01c137acdb608d7d83caf2..8ae51bf67e51fa0f9acdc906560c566f75780b5a 100755 (executable)
--- a/tests/ts/fdisk/mbr-sort
+++ b/tests/ts/fdisk/mbr-sort
@@ -51,7 +51,7 @@ TEST_IMAGE_NAME=$(ts_image_init 20)   # 20 MiB
 
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_WRITE_CLOSE}" \
-        | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+        | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
 
 print_layout
 

diff --git a/tests/ts/fdisk/sunlabel b/tests/ts/fdisk/sunlabel
index edf7f2eac3fa5b6c530f33974e2d291912f64e6e..7f72743f40771aa00694828bb51f4aa05ba9caeb 100755 (executable)
--- a/tests/ts/fdisk/sunlabel
+++ b/tests/ts/fdisk/sunlabel
@@ -43,7 +43,7 @@ ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_log "Create new SUN partition table"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETEALL}${FDISK_CMD_WRITE_CLOSE}" \
-        | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
+        | $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

diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index 4ace9a0ad1a9b9529807fe85955788e56d07dfa0..e355b6e9d8c6a030cca7c08ac6cfac90c525473b 100755 (executable)
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -20,7 +20,6 @@ TS_DESC="is mounted"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_HELPER_ISMOUNTED"

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 2277ca16d414aff49bd43e818675e97bd2f158e9..babeec98f07daaf73f14574a4c272be4e1819e8e 100755 (executable)
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -39,7 +39,7 @@ if [ "$has_mtab" == "yes" ]; then
 fi
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p

diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 941a7fe4214ffadfd6bd5904c9c9f25a86ad18c1..edbf75f07679a24df74acebf5136598e6d6f719f 100755 (executable)
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -48,7 +48,7 @@ if [ "$has_mtab" == "yes" ]; then
 fi
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p

diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 8702e24c70dbe61c9cbcd2524be0dac2fb1e5888..47a6769bef173e0a64c6b48b05b5a56b16ad13b6 100755 (executable)
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -30,7 +30,7 @@ ts_scsi_debug_init dev_size_mb=257
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p

diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index 9950617b5fe8645cf180283cae17d331fdd6cef0..0baff118c56ef9d5250f6938e3029589f324a03d 100755 (executable)
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -35,7 +35,7 @@ ts_scsi_debug_init dev_size_mb=257
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p

diff --git a/tests/ts/mount/fstab-all b/tests/ts/mount/fstab-all
index e8f0c9ea46e914d723ff9be3f9adaed91cb3006d..acc64e462e08510891b6682fcddf625d94604474 100755 (executable)
--- a/tests/ts/mount/fstab-all
+++ b/tests/ts/mount/fstab-all
@@ -21,7 +21,7 @@ ts_check_prog "mkfs.ext4"
 ts_scsi_debug_init dev_size_mb=50
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p

diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index 1be8c4be4bce5ac3497f079eea71dd622930d0bd..37a163d87929c59833fffb3a10f17cafb9518aa5 100755 (executable)
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -27,7 +27,7 @@ fi
 ts_scsi_debug_init dev_size_mb=50
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p

diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index 90ca0272a70e9139b8d998e49ed43b7c8ebf630e..700c58c12edae154adb195e30f1f385cf785fe7f 100755 (executable)
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -23,7 +23,7 @@ ts_log "Init device"
 ts_scsi_debug_init dev_size_mb=50
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p

diff --git a/tests/ts/sfdisk/dump b/tests/ts/sfdisk/dump
index 917e4aec4235b7a633de32dc044fa00236ef7480..09a126747afcb5e80c03f534131d13a1415856b9 100755 (executable)
--- a/tests/ts/sfdisk/dump
+++ b/tests/ts/sfdisk/dump
@@ -22,7 +22,6 @@ TS_DESC="script"
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_SFDISK"
-ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_WIPEFS"
 
 ts_skip_nonroot

diff --git a/tests/ts/sfdisk/script b/tests/ts/sfdisk/script
index 43655958f8f4d9559c21640c1dee709101e6dda0..501fce14fe5e52a853d5fab91888ed282c5b197a 100755 (executable)
--- a/tests/ts/sfdisk/script
+++ b/tests/ts/sfdisk/script
@@ -22,7 +22,6 @@ TS_DESC="script"
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_SFDISK"
-ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_WIPEFS"
 
 ts_skip_nonroot