vol_id: fix language in manpage

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 6d055943371ac241ca2b59af2ddf8ad2e4801080..f4d71217933b0f89f2f169906a00f032009ff4e5 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -505,10 +505,10 @@ static int rename_netif(struct udev_event *event)
                        goto exit;
                }
 
-               /* wait 30 seconds for our target to become available */
+               /* wait 90 seconds for our target to become available */
                util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
                util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ);
-               loop = 30 * 20;
+               loop = 90 * 20;
                while (loop--) {
                        err = ioctl(sk, SIOCSIFNAME, &ifr);
                        if (err == 0) {
@@ -522,7 +522,7 @@ static int rename_netif(struct udev_event *event)
                                break;
                        }
                        dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
-                           event->name, (30 * 20) - loop);
+                           event->name, (90 * 20) - loop);
                        usleep(1000 * 1000 / 20);
                }
        }
@@ -550,6 +550,16 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 
                dbg(event->udev, "device node add '%s'\n", udev_device_get_devpath(dev));
 
+               /* read old database entry */
+               dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
+               if (dev_old != NULL) {
+                       udev_device_read_db(dev_old);
+                       udev_device_set_info_loaded(dev_old);
+
+                       /* disable watch during event processing */
+                       udev_watch_end(event->udev, dev_old);
+               }
+
                udev_rules_apply_to_event(rules, event);
                if (event->tmp_node != NULL) {
                        dbg(event->udev, "removing temporary device node\n");
@@ -560,12 +570,12 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 
                if (event->ignore_device) {
                        info(event->udev, "device event will be ignored\n");
-                       goto exit;
+                       goto exit_add;
                }
 
                if (event->name != NULL && event->name[0] == '\0') {
                        info(event->udev, "device node creation supressed\n");
-                       goto exit;
+                       goto exit_add;
                }
 
                if (event->name == NULL) {
@@ -573,7 +583,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                             udev_device_get_sysname(event->dev));
                        event->name = strdup(udev_device_get_sysname(event->dev));
                        if (event->name == NULL)
-                               goto exit;
+                               goto exit_add;
                }
 
                /* set device node name */
@@ -582,22 +592,17 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                util_strlcat(filename, event->name, sizeof(filename));
                udev_device_set_devnode(dev, filename);
 
-               /* read current database entry */
-               dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
-               if (dev_old != NULL) {
-                       udev_device_read_db(dev_old);
-                       udev_device_set_info_loaded(dev_old);
-               }
-
-               /* update database, create node and symlinks */
+               /* write current database entry */
                udev_device_update_db(dev);
-               err = udev_node_add(dev, event->mode, event->uid, event->gid);
 
                /* remove/update possible left-over symlinks from old database entry */
-               if (dev_old != NULL) {
+               if (dev_old != NULL)
                        udev_node_update_old_links(dev, dev_old);
-                       udev_device_unref(dev_old);
-               }
+
+               /* create new node and symlinks */
+               err = udev_node_add(dev, event->mode, event->uid, event->gid);
+exit_add:
+               udev_device_unref(dev_old);
                goto exit;
        }
 
@@ -649,6 +654,9 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                udev_device_set_info_loaded(dev);
                udev_device_delete_db(dev);
 
+               /* remove watch */
+               udev_watch_end(event->udev, dev);
+
                if (udev_device_get_devnode(dev) == NULL) {
                        char devnode[UTIL_PATH_SIZE];