From: Yu Watanabe Date: Fri, 8 Apr 2022 21:50:41 +0000 (+0900) Subject: test: always invoke systemd-repart with --no-pager X-Git-Tag: v251-rc2~150 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=928c6c00c37cc01860a0a6fec30e8188bb52929b;p=thirdparty%2Fsystemd.git test: always invoke systemd-repart with --no-pager Follow-up for 31cf58864d3f437c7e3f0497df0fef85130f159d. --- diff --git a/src/partition/test-repart.sh b/src/partition/test-repart.sh index 89f62665391..2b9bebbe8cc 100755 --- a/src/partition/test-repart.sh +++ b/src/partition/test-repart.sh @@ -22,7 +22,7 @@ SEED=e2a40bf9-73f1-4278-9160-49c031e7aef8 echo "### Testing systemd-repart --empty=create ###" -"$repart" "$D/zzz" --empty=create --size=1G --seed="$SEED" +"$repart" "$D/zzz" --empty=create --size=1G --seed="$SEED" --no-pager sfdisk -d "$D/zzz" | grep -v -e 'sector-size' -e '^$' >"$D/empty" @@ -58,7 +58,7 @@ SizeMaxBytes=64M PaddingMinBytes=92M EOF -"$repart" "$D/zzz" --dry-run=no --seed="$SEED" --definitions="$D/definitions" +"$repart" "$D/zzz" --dry-run=no --seed="$SEED" --definitions="$D/definitions" --no-pager sfdisk -d "$D/zzz" | grep -v -e 'sector-size' -e '^$' >"$D/populated" @@ -93,7 +93,7 @@ EOF echo "Label=ignored_label" >>"$D/definitions/home.conf" echo "UUID=b0b1b2b3b4b5b6b7b8b9babbbcbdbebf" >>"$D/definitions/home.conf" -"$repart" "$D/zzz" --dry-run=no --seed="$SEED" --definitions="$D/definitions" +"$repart" "$D/zzz" --dry-run=no --seed="$SEED" --definitions="$D/definitions" --no-pager sfdisk -d "$D/zzz" | grep -v -e 'sector-size' -e '^$' >"$D/populated2" @@ -113,7 +113,7 @@ EOF echo "### Resizing to 2G ###" -"$repart" "$D/zzz" --size=2G --dry-run=no --seed="$SEED" --definitions="$D/definitions" +"$repart" "$D/zzz" --size=2G --dry-run=no --seed="$SEED" --definitions="$D/definitions" --no-pager sfdisk -d "$D/zzz" | grep -v -e 'sector-size' -e '^$' >"$D/populated3" @@ -143,7 +143,7 @@ UUID=2a1d97e1d0a346cca26eadc643926617 CopyBlocks=$D/block-copy EOF -"$repart" "$D/zzz" --size=3G --dry-run=no --seed="$SEED" --definitions="$D/definitions" +"$repart" "$D/zzz" --size=3G --dry-run=no --seed="$SEED" --definitions="$D/definitions" --no-pager sfdisk -d "$D/zzz" | grep -v -e 'sector-size' -e '^$' >"$D/populated4" @@ -180,7 +180,7 @@ CopyFiles=$D/definitions:/def SizeMinBytes=48M EOF - "$repart" "$D/zzz" --size=auto --dry-run=no --seed="$SEED" --definitions="$D/definitions" + "$repart" "$D/zzz" --size=auto --dry-run=no --seed="$SEED" --definitions="$D/definitions" --no-pager sfdisk -d "$D/zzz" | grep -v -e 'sector-size' -e '^$' >"$D/populated5"