X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevd.c;h=27e64dae3acbb9a8a6d6f3388ac2842686b4e01e;hp=094175ac4a4a75354d537edc7b79d38c17b27637;hb=03e0170db3ef69c70db7cd74e6689c7b78c91c3d;hpb=4aca304e48d69766d47439f0d3dcaa8797b46c78

diff --git a/udev/udevd.c b/udev/udevd.c
index 094175ac4..27e64dae3 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -215,6 +215,9 @@ static void event_fork(struct udev_event *event)
 		/* set timeout to prevent hanging processes */
 		alarm(UDEV_EVENT_TIMEOUT);
 
+		/* clear any existing udev watch on the node */
+		udev_watch_clear(event->udev, event->dev);
+
 		/* apply rules, create node, symlinks */
 		err = udev_event_execute_rules(event, rules);
 
@@ -226,6 +229,12 @@ 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 &&
+		    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);
+
 		info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
 		logging_close();
 		if (err != 0)