tests: update swapfile output

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

diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel
index 623139e474f6516dbbb9f5d9c5ae469ce7779720..13abc0bf8acc9999d3ef2e4d221c6c440c81aada 100644 (file)
--- a/tests/expected/misc/swaplabel
+++ b/tests/expected/misc/swaplabel
@@ -1,4 +1,5 @@
 mkswap: error: swap area needs to be at least 10 pages
+mkswap: <swapfile>: insecure permissions 0644, 0600 suggested.
 mkswap: Label was truncated.
 Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes)
 LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab

diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel
index 9bfc6896b3fc73b56272d1831a92a72a8e203b56..5653742aa241792071f5c1afbdce7a711753e486 100755 (executable)
--- a/tests/ts/misc/swaplabel
+++ b/tests/ts/misc/swaplabel
@@ -42,7 +42,8 @@ $TS_CMD_MKSWAP \
        --label 1234567890abcdef \
        --uuid 12345678-abcd-abcd-abcd-1234567890ab \
        $IMAGE 2>&1 |\
-       sed "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \
+       sed -e "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \
+           -e "s:$IMAGE:<swapfile>:g" \
        >> $TS_OUTPUT 2>&1
 
 rm -f $IMAGE
@@ -53,6 +54,7 @@ $TS_CMD_MKSWAP \
        $IMAGE 2>&1 |\
        sed -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \
            -e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE )) bytes)/(9xPGSZ bytes)/" \
+           -e "s:$IMAGE:<swapfile>:g" \
        >> $TS_OUTPUT 2>&1
 $TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1