summaryrefslogtreecommitdiffstats
path: root/tests/expected/fdisk
diff options
context:
space:
mode:
authorKarel Zak2014-08-08 12:35:20 +0200
committerKarel Zak2014-08-08 12:35:20 +0200
commit4fdde144f0acc042fa1fc56db84f4dc50afde1a9 (patch)
treeb38e97419a8ec379ddfe4ddef5e477b318d46645 /tests/expected/fdisk
parentlibblkid: (gpt) use real sector size to set PTMAGIC_OFFSET (diff)
downloadkernel-qcow2-util-linux-4fdde144f0acc042fa1fc56db84f4dc50afde1a9.tar.gz
kernel-qcow2-util-linux-4fdde144f0acc042fa1fc56db84f4dc50afde1a9.tar.xz
kernel-qcow2-util-linux-4fdde144f0acc042fa1fc56db84f4dc50afde1a9.zip
fdisk: update tests and clean up output
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/expected/fdisk')
-rw-r--r--tests/expected/fdisk/align-512-4K1
-rw-r--r--tests/expected/fdisk/align-512-4K-631
-rw-r--r--tests/expected/fdisk/align-512-4K-md2
-rw-r--r--tests/expected/fdisk/align-512-5121
-rw-r--r--tests/expected/fdisk/align-512-512-topology1
-rw-r--r--tests/expected/fdisk/mbr-dos-mode2
-rw-r--r--tests/expected/fdisk/mbr-nondos-mode3
-rw-r--r--tests/expected/fdisk/mbr-sort3
-rw-r--r--tests/expected/fdisk/oddinput1
9 files changed, 6 insertions, 9 deletions
diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index 49f93751d..261f16912 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -64,6 +64,7 @@ Device Boot Start End Sectors Size Id Type
<removed>6 77824 88063 10240 5M 83 Linux
<removed>7 90112 102399 12288 6M 83 Linux
+
Command (m for help): The partition table has been altered.
Calling ioctl() to re-read partition table.
Syncing disks.
diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 6e44cfe2b..ee58b3a2a 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -65,6 +65,7 @@ Device Boot Start End Sectors Size Id Type
<removed>6 75775 86014 10240 5M 83 Linux
<removed>7 88063 102399 14337 7M 83 Linux
+
Command (m for help): The partition table has been altered.
Calling ioctl() to re-read partition table.
Syncing disks.
diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index 317865a86..87777f774 100644
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -30,6 +30,7 @@ Device Boot Start End Sectors Size Id Type
<removed>1 2048 43007 40960 20M 83 Linux
<removed>2 43008 102399 59392 29M 83 Linux
+
Command (m for help): The partition table has been altered.
Calling ioctl() to re-read partition table.
Syncing disks.
@@ -69,6 +70,7 @@ Device Boot Start End Sectors Size Id Type
<removed>p1 2048 22527 20480 10M 83 Linux
<removed>p2 22528 43007 20480 10M 83 Linux
+
Command (m for help): The partition table has been altered.
Calling ioctl() to re-read partition table.
Syncing disks.
diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index 27df57051..b4a0e568a 100644
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -64,4 +64,5 @@ Device Boot Start End Sectors Size Id Type
<removed>p6 77824 88063 10240 5M 83 Linux
<removed>p7 90112 102399 12288 6M 83 Linux
+
Command (m for help):
diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 8ae0c4057..7552656ee 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -64,6 +64,7 @@ Device Boot Start End Sectors Size Id Type
<removed>6 77824 88063 10240 5M 83 Linux
<removed>7 90112 102399 12288 6M 83 Linux
+
Command (m for help): The partition table has been altered.
Calling ioctl() to re-read partition table.
Syncing disks.
diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode
index 5d84ea6f1..62c454a98 100644
--- a/tests/expected/fdisk/mbr-dos-mode
+++ b/tests/expected/fdisk/mbr-dos-mode
@@ -161,7 +161,6 @@ Device Boot Start End Cylinders Size Id Type
<removed>6 2 3 2 15.7M 83 Linux
Partition table entries are not in disk order.
-
-------------------
Delete primary partition
@@ -182,7 +181,6 @@ Device Boot Start End Cylinders Size Id Type
<removed>6 2 3 2 15.7M 83 Linux
Partition table entries are not in disk order.
-
-------------------
Delete extended partition
diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode
index f8af411d2..89396af46 100644
--- a/tests/expected/fdisk/mbr-nondos-mode
+++ b/tests/expected/fdisk/mbr-nondos-mode
@@ -157,7 +157,6 @@ Device Boot Start End Sectors Size Id Type
<removed>6 14336 18431 4096 2M 83 Linux
Partition table entries are not in disk order.
-
-------------------
Delete primary partition
@@ -178,7 +177,6 @@ Device Boot Start End Sectors Size Id Type
<removed>6 14336 18431 4096 2M 83 Linux
Partition table entries are not in disk order.
-
-------------------
Delete primary partition
@@ -198,7 +196,6 @@ Device Boot Start End Sectors Size Id Type
<removed>6 14336 18431 4096 2M 83 Linux
Partition table entries are not in disk order.
-
-------------------
Delete extended partition
diff --git a/tests/expected/fdisk/mbr-sort b/tests/expected/fdisk/mbr-sort
index fb897a386..d7fb6aae7 100644
--- a/tests/expected/fdisk/mbr-sort
+++ b/tests/expected/fdisk/mbr-sort
@@ -6,7 +6,6 @@ Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
-
-------------------
Create primary partitions
@@ -26,7 +25,6 @@ Device Boot Start End Sectors Size Id Type
<removed>4 8192 40959 32768 16M 5 Extended
Partition table entries are not in disk order.
-
-------------------
Create logical partitions
@@ -50,7 +48,6 @@ Device Boot Start End Sectors Size Id Type
<removed>8 10240 12287 2048 1M 83 Linux
Partition table entries are not in disk order.
-
-------------------
Fix order.
diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput
index a1dbdb6e0..7a91f8d2f 100644
--- a/tests/expected/fdisk/oddinput
+++ b/tests/expected/fdisk/oddinput
@@ -7,7 +7,6 @@ Geometry: 255 heads, 63 sectors/track, 1 cylinders
Units: cylinders of 16065 * 512 = 8225280 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
-
Nonexistant file
fdisk: cannot open _a_file_that_does_not_exist_: No such file or directory
Too small file