]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: --initialized=yes is the default for udevadm wait
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 6 Apr 2022 12:42:44 +0000 (21:42 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 6 Apr 2022 15:40:33 +0000 (00:40 +0900)
src/partition/test-repart.sh
test/units/testsuite-58.sh

index 88b696ba0150775dcf1585a5b48e12126b1910a6..89f626653915fba6314e41069043260ce213670d 100755 (executable)
@@ -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"
 
index 21f762d3996c276e2e78e3847e713e4824cf2c28..98b31277f0c6673fdf97d72477f58c5c36ce145f 100755 (executable)
@@ -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 <<EOF
 [Partition]
@@ -216,7 +216,7 @@ EOF
 
     truncate -s 100m "/tmp/testsuite-58-sector-$1.img"
     LOOP=$(losetup -b "$1" -P --show -f "/tmp/testsuite-58-sector-$1.img" )
-    udevadm wait --timeout 60 --initialized=yes --settle "${LOOP:?}"
+    udevadm wait --timeout 60 --settle "${LOOP:?}"
     systemd-repart --pretty=yes --definitions=/tmp/testsuite-58-sector/ --seed=750b6cd5c4ae4012a15e7be3c29e6a47 --empty=require --dry-run=no "$LOOP"
     rm -rf /tmp/testsuite-58-sector
     sfdisk --verify "$LOOP"