From 107f2e2526d476c6cc9b81a690391c111027d641 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 23 Apr 2015 15:19:13 +0200 Subject: udevd: fix REMOVE handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts b67f944. Lazy loading of device properties does not work for devices that are received over netlink, as these are sealed. Reinstate the unconditional loading of the device db. Reported by: Mantas Mikulėnas . --- src/udev/udev-event.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/udev') diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 978b21832d..2fa26a40be 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -794,6 +794,10 @@ void udev_event_execute_rules(struct udev_event *event, return; if (streq(udev_device_get_action(dev), "remove")) { + udev_device_read_db(dev); + udev_device_tag_index(dev, NULL, false); + udev_device_delete_db(dev); + if (major(udev_device_get_devnum(dev)) != 0) udev_watch_end(event->udev, dev); @@ -804,9 +808,6 @@ void udev_event_execute_rules(struct udev_event *event, if (major(udev_device_get_devnum(dev)) != 0) udev_node_remove(dev); - - udev_device_delete_db(dev); - udev_device_tag_index(dev, NULL, false); } else { event->dev_db = udev_device_clone_with_db(dev); if (event->dev_db != NULL) { -- cgit v1.2.3-54-g00ecf