diff options
| author | Karel Zak <kzak@redhat.com> | 2012-08-01 11:16:00 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2012-08-01 11:16:00 +0200 |
| commit | 31d33229a19a45c4ce9aa6e5961e2e1f8276cb1e (patch) | |
| tree | c4a30b079980ab12bc3d0b35d173b9809181c274 /tests/ts/fdisk | |
| parent | c057c0d2855c19bd0cef90af660173dd7a8dd0e9 (diff) | |
| download | util-linux-31d33229a19a45c4ce9aa6e5961e2e1f8276cb1e.tar.gz | |
tests: standardize fdisk headers in MBR tests
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/fdisk')
| -rwxr-xr-x | tests/ts/fdisk/mbr-dos-mode | 5 | ||||
| -rwxr-xr-x | tests/ts/fdisk/mbr-nondos-mode | 4 |
2 files changed, 6 insertions, 3 deletions
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 } |