summaryrefslogtreecommitdiff
path: root/udev/udevd.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-12-25 15:23:45 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-12-25 15:23:45 +0100
commitf46d2e54a82086eddcd9cd91e7908e87d7424148 (patch)
treeea08dbce116f1411ecb5369f696b3fac000ebf00 /udev/udevd.c
parent1d67ec16c44711bbfb50ac7dd8bb2fb6e64a80f3 (diff)
remove UDEV_RUN environment variable
It handles only RUN but not IMPORT and PROGRAM. There is no sane way to suppress program execution. Most important programs run with IMPORT these days. Also events can no longer suppressed with the libudev netlink messages, so UDEV_RUN does nothing useful and is just inconsistent.
Diffstat (limited to 'udev/udevd.c')
-rw-r--r--udev/udevd.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/udev/udevd.c b/udev/udevd.c
index 99647c683c..170225d00c 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -292,12 +292,9 @@ static void worker_new(struct event *event)
if (udev_device_get_event_timeout(dev) >= 0)
alarm(udev_device_get_event_timeout(dev));
- /* execute RUN= */
- if (err == 0 && udev_get_run(udev_event->udev))
- failed = udev_event_execute_run(udev_event,
- &orig_sigmask);
+ if (err == 0)
+ failed = udev_event_execute_run(udev_event, &orig_sigmask);
- /* reset alarm */
alarm(0);
/* apply/restore inotify watch */
@@ -309,7 +306,7 @@ static void worker_new(struct event *event)
/* send processed event back to libudev listeners */
udev_monitor_send_device(worker_monitor, NULL, dev);
- /* send back the result of the event execution */
+ /* send udevd the result of the event execution */
if (err != 0)
msg.exitcode = err;
else if (failed != 0)