tests: update for recent fdisk changes

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

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index ada266ef51a1724f6ae39ad424bac77194656599..0318046d7e15c20cffff40f90e8f9c39be94bba0 100644 (file)
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -51,7 +51,7 @@ TS_CMD_COL=${TS_CMD_COL:-"$top_builddir/text-utils/col"}
 TS_CMD_NAMEI=${TS_CMD_NAMEI-"$top_builddir/misc-utils/namei"}
 TS_CMD_LOOK=${TS_CMD_LOOK-"$top_builddir/misc-utils/look"}
 TS_CMD_CAL=${TS_CMD_CAL-"$top_builddir/misc-utils/cal"}
-TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/misc-utils/script"}
+TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/term-utils/script"}
 
 TS_CMD_CHECKTTY=${TS_CMD_CHECKTTY-"$top_builddir/login-utils/checktty_test"}
 TS_CMD_ISLOCAL=${TS_CMD_ISLOCAL-"$top_builddir/login-utils/islocal_test"}

diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole
index 2e0b824a3b41500af5791a66a5e6f05a4fdf067a..54e4012c36239b938776dd61b22094e7f729a755 100644 (file)
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -8,15 +8,15 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (2048-204543, default 2048): Using default value 2048
+Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-204543, default 204543): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (22528-204543, default 22528): Using default value 22528
+Select (default p): Partition number (1-4, default 2): First sector (22528-204543, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-204543, default 204543): Using default value 204543
 
 Command (m for help): 

diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index 96033ef8c8df5bc36baec6ff5a5ae8842dae7216..8f7787d9a8390e5c9016df4c4bb3372cd9b7fcc6 100644 (file)
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -6,15 +6,15 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (2048-104447, default 2048): Using default value 2048
+Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-104447, default 104447): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (53248-104447, default 53248): Using default value 53248
+Select (default p): Partition number (1-4, default 2): First sector (53248-104447, default 53248): Using default value 53248
 Last sector, +sectors or +size{K,M,G} (53248-104447, default 104447): Using default value 104447
 
 Command (m for help): 

diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index 32281c61c41f1781977c9615160e7bef97a8df1d..cbdbb7bc6cf4851a53cb06661efb87d96c306406 100644 (file)
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -8,15 +8,15 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (2048-102271, default 2048): Using default value 2048
+Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102271, default 102271): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (22528-102271, default 22528): Using default value 22528
+Select (default p): Partition number (1-4, default 2): First sector (22528-102271, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102271, default 102271): 
 Command (m for help): 
 Disk /dev/md8: 52 MB, 52363264 bytes

diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index c5b9e04cd515ad0f1b7643925b75c22358ec1d63..ed1e03be7e4b85e5b5003c808cea6f54e71188f5 100644 (file)
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -10,33 +10,39 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
+Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
+Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (2 primary, 0 extended, 2 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
+Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (3 primary, 0 extended, 1 free)
    e   extended
-   p   primary partition (1-4)
-Selected partition 4
+Select (default e): Selected partition 4
 First sector (63488-102399, default 63488): Using default value 63488
 Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399
 
-Command (m for help): First sector (65536-102399, default 65536): Using default value 65536
+Command (m for help): All primary partitions are in use
+Adding logical partition 5
+First sector (65536-102399, default 65536): Using default value 65536
 Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): 
-Command (m for help): First sector (77824-102399, default 77824): Using default value 77824
+Command (m for help): All primary partitions are in use
+Adding logical partition 6
+First sector (77824-102399, default 77824): Using default value 77824
 Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): 
-Command (m for help): First sector (90112-102399, default 90112): Using default value 90112
+Command (m for help): All primary partitions are in use
+Adding logical partition 7
+First sector (90112-102399, default 90112): Using default value 90112
 Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399
 
 Command (m for help): 

diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index b33794396eb9f411ae3f0cd8228249feb9b0a731..261f54c8c839ad207c9094ae79a80bf1af33cdad 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -10,33 +10,39 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (7-102399, default 7): Using default value 7
+Select (default p): Partition number (1-4, default 1): First sector (7-102399, default 7): Using default value 7
 Last sector, +sectors or +size{K,M,G} (7-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (20487-102399, default 20487): Using default value 20487
+Select (default p): Partition number (1-4, default 2): First sector (20487-102399, default 20487): Using default value 20487
 Last sector, +sectors or +size{K,M,G} (20487-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (2 primary, 0 extended, 2 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 3): First sector (40967-102399, default 40967): Using default value 40967
+Select (default p): Partition number (1-4, default 3): First sector (40967-102399, default 40967): Using default value 40967
 Last sector, +sectors or +size{K,M,G} (40967-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (3 primary, 0 extended, 1 free)
    e   extended
-   p   primary partition (1-4)
-Selected partition 4
+Select (default e): Selected partition 4
 First sector (61447-102399, default 61447): Using default value 61447
 Last sector, +sectors or +size{K,M,G} (61447-102399, default 102399): Using default value 102399
 
-Command (m for help): First sector (61454-102399, default 63487): Using default value 63487
+Command (m for help): All primary partitions are in use
+Adding logical partition 5
+First sector (61454-102399, default 63487): Using default value 63487
 Last sector, +sectors or +size{K,M,G} (63487-102399, default 102399): 
-Command (m for help): First sector (61454-102399, default 75775): Using default value 75775
+Command (m for help): All primary partitions are in use
+Adding logical partition 6
+First sector (61454-102399, default 75775): Using default value 75775
 Last sector, +sectors or +size{K,M,G} (75775-102399, default 102399): 
-Command (m for help): First sector (61454-102399, default 88063): Using default value 88063
+Command (m for help): All primary partitions are in use
+Adding logical partition 7
+First sector (61454-102399, default 88063): Using default value 88063
 Last sector, +sectors or +size{K,M,G} (88063-102399, default 102399): Using default value 102399
 
 Command (m for help): 

diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 8516053ecf6704ce284ccd7c470759da22f08f86..7de6d2e84be45f79e57796e3250d0e5400b2a0f7 100644 (file)
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -10,15 +10,15 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
+Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (43008-102399, default 43008): Using default value 43008
+Select (default p): Partition number (1-4, default 2): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using default value 102399
 
 Command (m for help): 
@@ -52,15 +52,15 @@ The device presents a logical sector size that is smaller than
 the physical sector size. Aligning to a physical sector (or optimal
 I/O) size boundary is recommended, or performance may be impacted.
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (2048-100095, default 2048): Using default value 2048
+Select (default p): Partition number (1-4, default 1): First sector (2048-100095, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-100095, default 100095): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (22528-100095, default 22528): Using default value 22528
+Select (default p): Partition number (1-4, default 2): First sector (22528-100095, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095): 
 Command (m for help): 
 Disk /dev/md8: 51 MB, 51249152 bytes

diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index c940f8062053fd34a5d9dd23d94484bd47b9a04c..13931d4145c333f418a5c73585bcf0b9cd2af799 100644 (file)
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -6,33 +6,39 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
+Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
+Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (2 primary, 0 extended, 2 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
+Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (3 primary, 0 extended, 1 free)
    e   extended
-   p   primary partition (1-4)
-Selected partition 4
+Select (default e): Selected partition 4
 First sector (63488-102399, default 63488): Using default value 63488
 Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399
 
-Command (m for help): First sector (65536-102399, default 65536): Using default value 65536
+Command (m for help): All primary partitions are in use
+Adding logical partition 5
+First sector (65536-102399, default 65536): Using default value 65536
 Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): 
-Command (m for help): First sector (77824-102399, default 77824): Using default value 77824
+Command (m for help): All primary partitions are in use
+Adding logical partition 6
+First sector (77824-102399, default 77824): Using default value 77824
 Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): 
-Command (m for help): First sector (90112-102399, default 90112): Using default value 90112
+Command (m for help): All primary partitions are in use
+Adding logical partition 7
+First sector (90112-102399, default 90112): Using default value 90112
 Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399
 
 Command (m for help): 

diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index bc631cf9e35197254cb225e7c98fd6be65bb9833..af8695528e23b68d1ed9c4d1ae464d881d19555f 100644 (file)
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -6,33 +6,39 @@ After that, of course, the previous content won't be recoverable.
 
 Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite)
 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (0 primary, 0 extended, 4 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
+Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048
 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (1 primary, 0 extended, 3 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
+Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528
 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (2 primary, 0 extended, 2 free)
    e   extended
-   p   primary partition (1-4)
-Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
+Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008
 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): 
-Command (m for help): Command action
+Command (m for help): Partition type:
+   p   primary (3 primary, 0 extended, 1 free)
    e   extended
-   p   primary partition (1-4)
-Selected partition 4
+Select (default e): Selected partition 4
 First sector (63488-102399, default 63488): Using default value 63488
 Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399
 
-Command (m for help): First sector (65536-102399, default 65536): Using default value 65536
+Command (m for help): All primary partitions are in use
+Adding logical partition 5
+First sector (65536-102399, default 65536): Using default value 65536
 Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): 
-Command (m for help): First sector (77824-102399, default 77824): Using default value 77824
+Command (m for help): All primary partitions are in use
+Adding logical partition 6
+First sector (77824-102399, default 77824): Using default value 77824
 Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): 
-Command (m for help): First sector (90112-102399, default 90112): Using default value 90112
+Command (m for help): All primary partitions are in use
+Adding logical partition 7
+First sector (90112-102399, default 90112): Using default value 90112
 Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399
 
 Command (m for help):