SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #25145 from yuwata/udevadm-trigger

Browse Source 
udev: make 'udevadm trigger --settle' work even if device is renamed
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-01-23 13:49:20 +01:00
committed by GitHub
parent a4bc35740a ff4d2a09fd
commit e830d6dd2d
4 changed files with 84 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/units/testsuite-17.02.sh
+2 -4
View File
@@ -61,9 +61,7 @@ EOF
udevadm control --log-priority=debug --reload --timeout=30
# FIXME(?): the 'add' uevent is broadcast as for 'foobar', instead of 'hoge'. Hence, we cannot use --settle here.
# See issue #25115.
udevadm trigger --action=add /sys/devices/virtual/net/hoge
udevadm trigger --action=add --settle /sys/devices/virtual/net/hoge
udevadm wait --timeout=30 --settle /sys/devices/virtual/net/foobar
assert_not_in "ID_RENAMING=" "$(udevadm info /sys/devices/virtual/net/foobar)"
timeout 30 bash -c 'while [[ "$(systemctl show --property=ActiveState --value /sys/devices/virtual/net/hoge)" != "inactive" ]]; do sleep .5; done'
@@ -71,7 +69,7 @@ timeout 30 bash -c 'while [[ "$(systemctl show --property=ActiveState --value /s
timeout 30 bash -c 'while [[ "$(systemctl show --property=ActiveState --value /sys/devices/virtual/net/foobar)" != "active" ]]; do sleep .5; done'
timeout 30 bash -c 'while [[ "$(systemctl show --property=ActiveState --value /sys/subsystem/net/devices/foobar)" != "active" ]]; do sleep .5; done'
udevadm trigger --action=add /sys/devices/virtual/net/foobar
udevadm trigger --action=add --settle /sys/devices/virtual/net/foobar
udevadm wait --timeout=30 --settle /sys/devices/virtual/net/hoge
assert_not_in "ID_RENAMING=" "$(udevadm info /sys/devices/virtual/net/hoge)"
timeout 30 bash -c 'while [[ "$(systemctl show --property=ActiveState --value /sys/devices/virtual/net/hoge)" != "active" ]]; do sleep .5; done'