diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-05 12:23:06 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-05 12:23:06 +0100 |
| commit | 77b852f3334311575b9c19ffb29d4a77a21b4bb2 (patch) | |
| tree | ebc5693b757bbb5efc1aed8789d1c9f15526c8a3 /udev/udev-event.c | |
| parent | 6e0cb78c9d59f976222ecd88c172b4cd9a5b7347 (diff) | |
do not import the "uevent" file when we only read the db to get old symlinks
Diffstat (limited to 'udev/udev-event.c')
| -rw-r--r-- | udev/udev-event.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/udev/udev-event.c b/udev/udev-event.c index 1c640cf37d..fe579b49c7 100644 --- a/udev/udev-event.c +++ b/udev/udev-event.c @@ -585,8 +585,10 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) /* read current database entry */ dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev)); - if (dev_old != NULL) - udev_device_load_info(dev_old); + if (dev_old != NULL) { + udev_device_read_db(dev_old); + udev_device_set_info_loaded(dev_old); + } /* update database, create node and symlinks */ udev_device_update_db(dev); @@ -642,7 +644,8 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules) /* remove device node */ if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) { /* import database entry and delete it */ - udev_device_load_info(dev); + udev_device_read_db(dev); + udev_device_set_info_loaded(dev); udev_device_delete_db(dev); if (udev_device_get_devnode(dev) == NULL) { |