Merge pull request #26650 from yuwata/udev-trigger

test: generate debugging logs for udevd after restart

man/udevadm.xml

@@ -490,8 +490,8 @@
           <term><option>--wait-daemon[=<replaceable>SECONDS</replaceable>]</option></term>
           <listitem>
             <para>Before triggering uevents, wait for systemd-udevd daemon to be initialized.
-            Optionally takes timeout value. Default timeout is 5 seconds. This is equivalent to invoke
-            invoking <command>udevadm control --ping</command> before <command>udevadm trigger</command>.</para>
+            Optionally takes timeout value. Default timeout is 5 seconds. This is equivalent to invoking
+            <command>udevadm control --ping</command> before <command>udevadm trigger</command>.</para>
           </listitem>
         </varlistentry>
 

test/units/testsuite-17.10.sh

@@ -29,14 +29,15 @@ loopdev="$(losetup --show -f "$blk")"
 
 udevadm -h
 
+udevadm control -e
 udevadm control -l emerg
 udevadm control -l alert
 udevadm control -l crit
 udevadm control -l err
 udevadm control -l warning
 udevadm control -l notice
-udevadm control -l debug
 udevadm control --log-level info
+udevadm control --log-level debug
 (! udevadm control -l hello)
 udevadm control -s
 udevadm control -S
@@ -46,7 +47,6 @@ udevadm control -m 42
 udevadm control --ping
 udevadm control -t 5
 udevadm control -h
-udevadm control -e
 
 udevadm info /dev/null
 udevadm info /sys/class/net/$netdev
@@ -87,6 +87,7 @@ assert_rc 124 timeout 5 udevadm monitor -t systemd
 assert_rc 124 timeout 5 udevadm monitor --tag-match hello
 udevadm monitor -h
 
+udevadm settle
 udevadm settle -t 5
 udevadm settle -E /sys/class/net/$netdev
 udevadm settle -h
@@ -193,7 +194,9 @@ udevadm trigger --initialized-match
 udevadm trigger --initialized-nomatch
 udevadm trigger -w
 udevadm trigger --uuid /sys/class/net/$netdev
+udevadm settle -t 300
 udevadm trigger --wait-daemon
+udevadm settle -t 300
 udevadm trigger --wait-daemon=5
 udevadm trigger -h