From: David Disseldorp <ddiss@suse.de>
Date: Mon, 23 Mar 2026 04:45:58 +0000 (+1100)
Subject: common/rc: add default _udev_wait timeout
X-Git-Tag: v2026.05.17~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4192c9e2266c8e92b49e3f73fe505101ab36ce1b;p=xfstests-dev.git

common/rc: add default _udev_wait timeout

If udevd isn't running then "udevadm wait" loops endlessly. With a
--timeout parameter provided, udevadm (udev-254.27) prints to stderr:
  Timed out for waiting devices being initialized.

The error message causes test failure via golden output mismatch and
is easier to debug than an infinite loop.

The timeout parameter is also compatible with existing
args="--removed <dev>" callers. 60 seconds is relatively arbitrary, but
should be long enough to avoid premature timeout on regular systems.

Signed-off-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Zorro Lang <zlang@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/common/rc b/common/rc
index 26db5bbd..1acaf353 100644
--- a/common/rc
+++ b/common/rc
@@ -5609,7 +5609,7 @@ _udev_wait()
 	if [ -z "$UDEV_WAIT_PROG" ]; then
 		$UDEV_SETTLE_PROG >/dev/null 2>&1
 	else
-		$UDEV_WAIT_PROG $args
+		$UDEV_WAIT_PROG --timeout 60 $args
 	fi
 }