From 11a182aa1e64f3e264d08d7a8e73f9614a090dca Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 27 Jan 2020 23:10:05 +0900 Subject: [PATCH] test: drop sector-size line from output of sfdisk The following commit adds 'sector-size' line to the output of sfdisk command: https://github.com/karelzak/util-linux/commit/e56ca0681514dcf0846225cd67a72d1ab260b8a6 Fixes #14664. --- test/TEST-45-REPART/test.sh | 2 +- test/TEST-45-REPART/testsuite.sh | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/test/TEST-45-REPART/test.sh b/test/TEST-45-REPART/test.sh index cdec7c4bdc3..f1f4660027d 100755 --- a/test/TEST-45-REPART/test.sh +++ b/test/TEST-45-REPART/test.sh @@ -14,7 +14,7 @@ test_setup() { setup_basic_environment mask_supporting_services - dracut_install truncate sfdisk + dracut_install truncate sfdisk grep # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service < /tmp/empty +sfdisk -d /tmp/zzz | grep -v -e 'sector-size' -e '^$' > /tmp/empty cmp /tmp/empty - < /tmp/populated +sfdisk -d /tmp/zzz | grep -v -e 'sector-size' -e '^$' > /tmp/populated cmp /tmp/populated - < /tmp/populated2 +sfdisk -d /tmp/zzz | grep -v -e 'sector-size' -e '^$' > /tmp/populated2 cmp /tmp/populated2 - < /tmp/populated3 +sfdisk -d /tmp/zzz | grep -v -e 'sector-size' -e '^$' > /tmp/populated3 cmp /tmp/populated3 - <