Don't add inotify watch until RUN rules processed.

The programs we RUN can open device nodes, and thus we can end up
chasing our own tail.

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 592da01099dcb9dcb057171726abf982b50a3652..e34f09cfe3dc156d7f815d9eb319b60e2678626f 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -600,14 +600,6 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 
                /* create new node and symlinks */
                err = udev_node_add(dev, event->mode, event->uid, event->gid);
-
-               /* watch for changes */
-               if (event->inotify_watch && inotify_fd != -1) {
-                       info(event->udev, "device will be watched for changes\n");
-                       udev_watch_begin(event->udev, event->dev);
-               } else {
-                       udev_watch_clear(event->udev, event->dev);
-               }
                goto exit;
        }
 

diff --git a/udev/udevd.c b/udev/udevd.c
index 094175ac4a4a75354d537edc7b79d38c17b27637..e4fa2b63e10a58044d6cf356139bef8095aaadf0 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -226,6 +226,16 @@ static void event_fork(struct udev_event *event)
                if (err == 0 && !event->ignore_device && udev_get_run(event->udev))
                        udev_event_execute_run(event);
 
+               /* apply/restore inotify watch */
+               if (err == 0 && event->inotify_watch && inotify_fd != -1 &&
+                   major(udev_device_get_devnum(event->dev)) != 0 &&
+                   strcmp(udev_device_get_action(event->dev), "remove") != 0) {
+                       info(event->udev, "device will be watched for changes\n");
+                       udev_watch_begin(event->udev, event->dev);
+               } else {
+                       udev_watch_clear(event->udev, event->dev);
+               }
+
                info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
                logging_close();
                if (err != 0)