From: Karel Zak Date: Tue, 26 Jan 2016 15:02:54 +0000 (+0100) Subject: tests: update swapfile output X-Git-Tag: v2.28-rc1~148 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b35831b7558153993d6e5fd3cbec48376eeddaf1;p=thirdparty%2Futil-linux.git tests: update swapfile output Signed-off-by: Karel Zak --- diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel index 623139e474..13abc0bf8a 100644 --- 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: : 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 9bfc6896b3..5653742aa2 100755 --- 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::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::g" \ >> $TS_OUTPUT 2>&1 $TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1