* [PATCH] udevadm: settle - fix timeout
@ 2009-05-20 13:24 Alan Jenkins
2009-05-20 14:19 ` Kay Sievers
0 siblings, 1 reply; 2+ messages in thread
From: Alan Jenkins @ 2009-05-20 13:24 UTC (permalink / raw)
To: linux-hotplug
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@tuffmail.co.uk>
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);
}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] udevadm: settle - fix timeout
2009-05-20 13:24 [PATCH] udevadm: settle - fix timeout Alan Jenkins
@ 2009-05-20 14:19 ` Kay Sievers
0 siblings, 0 replies; 2+ messages in thread
From: Kay Sievers @ 2009-05-20 14:19 UTC (permalink / raw)
To: linux-hotplug
On Wed, May 20, 2009 at 15:24, Alan Jenkins <alan-jenkins@tuffmail.co.uk> wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-20 14:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-20 13:24 [PATCH] udevadm: settle - fix timeout Alan Jenkins
2009-05-20 14:19 ` Kay Sievers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).