From 8128f2297da0c2fdd82b3d48f049deb01763f8c8 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 15 May 2015 11:35:15 +0200 Subject: udevd: event - port spawn_wait() to sd-event This allows us to drop the special sigterm handling in spawn_wait() as this will now be passed directly to the worker event loop. We now log failing spawend processes at 'warning' level, and timeouts are in terms of CLOCK_BOOTTIME when available, otherwise the behavior is unchanged. --- src/udev/udevd.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/udev/udevd.c') diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 3022cd225f..dbfe5f940f 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -406,9 +406,6 @@ static void worker_spawn(Manager *manager, struct event *event) { goto out; } - /* needed for SIGCHLD/SIGTERM in spawn() */ - udev_event->fd_signal = fd_signal; - if (arg_exec_delay > 0) udev_event->exec_delay = arg_exec_delay; @@ -481,11 +478,6 @@ skip: udev_device_unref(dev); dev = NULL; - if (udev_event->sigterm) { - udev_event_unref(udev_event); - goto out; - } - udev_event_unref(udev_event); /* wait for more device messages from main udevd, or term signal */ -- cgit v1.2.3-54-g00ecf