summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/expected/fdisk/mbr-dos-mode22
-rw-r--r--tests/expected/fdisk/mbr-nondos-mode24
-rwxr-xr-xtests/ts/fdisk/mbr-dos-mode5
-rwxr-xr-xtests/ts/fdisk/mbr-nondos-mode4
4 files changed, 29 insertions, 26 deletions
diff --git a/tests/expected/fdisk/mbr-dos-mode b/tests/expected/fdisk/mbr-dos-mode
index 16de4d59..b04f9567 100644
--- a/tests/expected/fdisk/mbr-dos-mode
+++ b/tests/expected/fdisk/mbr-dos-mode
@@ -11,7 +11,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
-------------------
Create primary partition
@@ -25,7 +25,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 1 1 8001 83 Linux
-------------------
@@ -40,7 +40,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 1 1 8001 bf Solaris
-------------------
@@ -55,7 +55,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 * 1 1 8001 bf Solaris
-------------------
@@ -70,7 +70,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 1 1 8001 83 Linux
-------------------
@@ -85,7 +85,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 1 1 8001 83 Linux
__ts_dev__2 2 12 88357+ 5 Extended
-------------------
@@ -101,7 +101,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 1 1 8001 83 Linux
__ts_dev__2 2 12 88357+ 5 Extended
__ts_dev__5 2 3 16033+ 83 Linux
@@ -121,7 +121,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 1 1 8001 83 Linux
__ts_dev__2 2 12 88357+ 5 Extended
__ts_dev__5 6 7 16033+ 83 Linux
@@ -138,7 +138,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 1 1 8001 83 Linux
__ts_dev__2 2 12 88357+ 5 Extended
__ts_dev__5 6 7 16033+ 83 Linux
@@ -158,7 +158,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__2 2 12 88357+ 5 Extended
__ts_dev__5 6 7 16033+ 83 Linux
__ts_dev__6 2 3 16033+ 83 Linux
@@ -177,6 +177,6 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
-------------------
diff --git a/tests/expected/fdisk/mbr-nondos-mode b/tests/expected/fdisk/mbr-nondos-mode
index 088ce67b..6ded30f8 100644
--- a/tests/expected/fdisk/mbr-nondos-mode
+++ b/tests/expected/fdisk/mbr-nondos-mode
@@ -10,7 +10,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
-------------------
Create 1st primary partition
@@ -23,7 +23,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 2048 8191 3072 83 Linux
-------------------
@@ -37,7 +37,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 * 2048 8191 3072 83 Linux
-------------------
@@ -51,7 +51,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 2048 8191 3072 83 Linux
-------------------
@@ -65,7 +65,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 2048 8191 3072 83 Linux
__ts_dev__2 8192 12287 2048 83 Linux
-------------------
@@ -80,7 +80,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 2048 8191 3072 83 Linux
__ts_dev__2 8192 12287 2048 83 Linux
__ts_dev__3 12288 40959 14336 5 Extended
@@ -96,7 +96,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 2048 8191 3072 83 Linux
__ts_dev__2 8192 12287 2048 83 Linux
__ts_dev__3 12288 40959 14336 5 Extended
@@ -116,7 +116,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 2048 8191 3072 83 Linux
__ts_dev__2 8192 12287 2048 83 Linux
__ts_dev__3 12288 40959 14336 5 Extended
@@ -133,7 +133,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__1 2048 8191 3072 83 Linux
__ts_dev__2 8192 12287 2048 83 Linux
__ts_dev__3 12288 40959 14336 5 Extended
@@ -153,7 +153,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__2 8192 12287 2048 83 Linux
__ts_dev__3 12288 40959 14336 5 Extended
__ts_dev__5 26624 30719 2048 83 Linux
@@ -172,7 +172,7 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
__ts_dev__3 12288 40959 14336 5 Extended
__ts_dev__5 26624 30719 2048 83 Linux
__ts_dev__6 14336 18431 2048 83 Linux
@@ -190,6 +190,6 @@ Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disk identifier: 0x00000001
- Device Boot Start End Blocks Id System
+ Device Boot Start End Blocks Id System
-------------------
diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode
index 8226b574..07b20061 100755
--- a/tests/ts/fdisk/mbr-dos-mode
+++ b/tests/ts/fdisk/mbr-dos-mode
@@ -39,9 +39,10 @@ FDISK_CMD_DELETE_EXTENDED="d\n2\n" # delete second primary
function print_layout {
echo -ne "\n---layout----------" >> $TS_OUTPUT
- $TS_CMD_FDISK -c=dos -u=cylinders -l ${TEST_IMAGE_NAME} | sed 's/^.*\.img/__ts_dev__/g' >> $TS_OUTPUT 2>&1
+ $TS_CMD_FDISK -c=dos -u=cylinders -l ${TEST_IMAGE_NAME} | \
+ sed 's/^.*\.img/__ts_dev__/g;
+ s/^[[:blank:]]*Device Boot/ Device Boot/g' >> $TS_OUTPUT 2>&1
echo -ne "-------------------\n\n" >> $TS_OUTPUT
- return 1
}
#
diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode
index 9999f1a5..119d2c9f 100755
--- a/tests/ts/fdisk/mbr-nondos-mode
+++ b/tests/ts/fdisk/mbr-nondos-mode
@@ -36,7 +36,9 @@ FDISK_CMD_DELETE_EXTENDED="d\n3\n" # delete second primary
function print_layout {
echo -ne "\n---layout----------" >> $TS_OUTPUT
- $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} | sed 's/^.*\.img/__ts_dev__/g' >> $TS_OUTPUT 2>&1
+ $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} | \
+ sed 's/^.*\.img/__ts_dev__/g;
+ s/^[[:blank:]]*Device Boot/ Device Boot/g' >> $TS_OUTPUT 2>&1
echo -ne "-------------------\n\n" >> $TS_OUTPUT
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-26 18:04:45 +0000