info(event->udev, "changing net interface name from '%s' to '%s'\n",
udev_device_get_sysname(dev), event->name);
- if (event->test)
- return 0;
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
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) {
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);
}
}
util_strlcat(filename, event->name, sizeof(filename));
udev_device_set_devnode(dev, filename);
- /* read current database entry */
+ /* 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);
}
- /* 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, event->test);
/* remove/update possible left-over symlinks from old database entry */
if (dev_old != NULL) {
- udev_node_update_old_links(dev, dev_old, event->test);
+ 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);
goto exit;
}
goto exit;
}
- err = udev_node_remove(dev, event->test);
+ err = udev_node_remove(dev);
goto exit;
}