[PATCH v2] common/rc: add default _udev_wait timeout

[PATCH v2] common/rc: add default _udev_wait timeout

[David Disseldorp]

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>
---
Changes since v1:
- increase timeout from 10 to 60 seconds

 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index fd4ca964..a490893f 100644
--- a/common/rc
+++ b/common/rc
@@ -5544,7 +5544,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
 }
 
-- 
2.51.0

Re: [PATCH v2] common/rc: add default _udev_wait timeout

[Zorro Lang]

On Mon, Mar 23, 2026 at 03:45:58PM +1100, David Disseldorp wrote:
> 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>
> ---
> Changes since v1:
> - increase timeout from 10 to 60 seconds
> 
>  common/rc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/rc b/common/rc
> index fd4ca964..a490893f 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -5544,7 +5544,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

60s is good to me. As there's not more review points from others, let's
have this change.

Reviewed-by: Zorro Lang <zlang@kernel.org>

>  	fi
>  }
>  
> -- 
> 2.51.0
> 
>