]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: always invoke systemd-repart with --no-pager
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 8 Apr 2022 21:50:41 +0000 (06:50 +0900)
committerLuca Boccassi <luca.boccassi@gmail.com>
Sat, 9 Apr 2022 12:44:10 +0000 (13:44 +0100)
Follow-up for 31cf58864d3f437c7e3f0497df0fef85130f159d.

src/partition/test-repart.sh

index 89f626653915fba6314e41069043260ce213670d..2b9bebbe8ccc5fbe1986986399c027860ae4f06a 100755 (executable)
@@ -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"