The timeout wasn't working when settle was run as root: # udevadm control --stop-exec-queue # udevadm trigger # udevadm settle --timeout=1 ... (hangs) Signed-off-by: Alan Jenkins <alan-jenkins@xxxxxxxxxxxxxx> diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c index 3b26f10..52d9c0b 100644 --- a/udev/udevadm-settle.c +++ b/udev/udevadm-settle.c @@ -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); } } -- To unsubscribe from this list: send the line "unsubscribe linux-hotplug" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
