Skip to contentSkip to conversation

udevadm: settle - fix timeout

PATCH Applied Alan Jenkins 2 participants 2 messages May 20, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 udevadm: settle - fix timeout

The timeout wasn't working when settle was run as root:

# udevadm control --stop-exec-queue
# udevadm trigger
# udevadm settle --timeout=1
... (hangs)
udev/udevadm-settle.c +1 -0
index 3b26f10..52d9c0b 100644
@@ -167,6 +167,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
 			sigprocmask(SIG_BLOCK, &mask, &oldmask);
 			if (udev_ctrl_send_settle(uctrl) > 0)
 				sigsuspend(&oldmask);
+			sigprocmask(SIG_SETMASK, &oldmask, NULL);
 			udev_ctrl_unref(uctrl);
 		}
 	}
Applied
#1 lore raw
Quoted 6 lines · Alan Jenkins

The timeout wasn't working when settle was run as root:

# udevadm control --stop-exec-queue
# udevadm trigger
# udevadm settle --timeout=1
... (hangs)

Applied.

Thanks,
Kay