From: Yu Watanabe Date: Wed, 6 Apr 2022 12:42:44 +0000 (+0900) Subject: test: --initialized=yes is the default for udevadm wait X-Git-Tag: v251-rc2~175^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3452ae90ea385f2d8a96f7263b980da49d9b36cc;p=thirdparty%2Fsystemd.git test: --initialized=yes is the default for udevadm wait --- diff --git a/src/partition/test-repart.sh b/src/partition/test-repart.sh index 88b696ba015..89f62665391 100755 --- a/src/partition/test-repart.sh +++ b/src/partition/test-repart.sh @@ -201,7 +201,7 @@ $D/zzz7 : start= 6291416, size= 98304, type=0FC63DAF-8483-4772-8E79-3D EOF LOOP="$(losetup -P --show --find "$D/zzz")" - "${udevadm:?}" wait --timeout 60 --initialized=yes --settle "${LOOP:?}" + "${udevadm:?}" wait --timeout 60 --settle "${LOOP:?}" VOLUME="test-repart-$RANDOM" diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh index 21f762d3996..98b31277f0c 100755 --- a/test/units/testsuite-58.sh +++ b/test/units/testsuite-58.sh @@ -174,7 +174,7 @@ rm -r /tmp/testsuite-58.3-defs/ mkdir -p /tmp/testsuite-58-issue-21817-defs/ truncate -s 100m /var/tmp/testsuite-58-issue-21817.img LOOP=$(losetup -P --show -f /var/tmp/testsuite-58-issue-21817.img) -udevadm wait --timeout 60 --initialized=yes --settle "${LOOP:?}" +udevadm wait --timeout 60 --settle "${LOOP:?}" printf 'size=50M,type=%s\n,\n' "${root_guid}" | sfdisk -X gpt "$LOOP" cat >/tmp/testsuite-58-issue-21817-defs/test.conf <