udevadm-trigger: reject invalid wait-daemon timeout

Return from argument parsing when --wait-daemon= cannot be parsed.

This matches the other timeout options.

Reproducer:
  udevadm trigger --dry-run --wait-daemon=bad

Before:
  Failed to parse timeout value 'bad', ignoring: Invalid argument

Follow-up:
  2001622c58
This commit is contained in:
dongshengyuan
2026-07-13 12:18:49 +08:00
parent 20e1e2de67
commit 4106cf7439
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -469,7 +469,7 @@ static int parse_argv(int argc, char *argv[]) {
if (opts.arg) {
r = parse_sec(opts.arg, &arg_ping_timeout_usec);
if (r < 0)
log_error_errno(r, "Failed to parse timeout value '%s', ignoring: %m", opts.arg);
return log_error_errno(r, "Failed to parse timeout value '%s': %m", opts.arg);
}
break;
+1
View File
@@ -282,6 +282,7 @@ udevadm trigger --parent-match /sys/class/net/$netdev --name-match /dev/null
udevadm trigger --initialized-match
udevadm trigger --initialized-nomatch
udevadm trigger -w
(! udevadm trigger --dry-run --wait-daemon=bad)
udevadm trigger --uuid /sys/class/net/$netdev
udevadm settle -t 300
udevadm trigger --wait-daemon