X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevd.c;h=aa2e3657f0262dd05a892255aebffcd3b66c3dbb;hp=2efab5b39d882d65b9413b29afc3f09a818e9174;hb=378380397c085c3c8858d3d7017b106f36577117;hpb=392ef7a28a7003a11f5e1e56617551ff5b9eabf9

diff --git a/udev/udevd.c b/udev/udevd.c
index 2efab5b39..aa2e3657f 100644
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -123,6 +123,7 @@ struct event {
 	const char *devpath_old;
 	dev_t devnum;
 	bool is_block;
+	int ifindex;
 };
 
 static struct event *node_to_event(struct udev_list_node *node)
@@ -419,6 +420,7 @@ static int event_queue_insert(struct udev_device *dev)
 	event->devpath_old = udev_device_get_devpath_old(dev);
 	event->devnum = udev_device_get_devnum(dev);
 	event->is_block = (strcmp("block", udev_device_get_subsystem(dev)) == 0);
+	event->ifindex = udev_device_get_ifindex(dev);
 
 	udev_queue_export_device_queued(udev_queue_export, dev);
 	info(event->udev, "seq %llu queued, '%s' '%s'\n", udev_device_get_seqnum(dev),
@@ -486,6 +488,10 @@ static bool is_devpath_busy(struct event *event)
 		if (major(event->devnum) != 0 && event->devnum == loop_event->devnum && event->is_block == loop_event->is_block)
 			return true;
 
+		/* check network device ifindex */
+		if (event->ifindex != 0 && event->ifindex == loop_event->ifindex)
+			return true;
+
 		/* check our old name */
 		if (event->devpath_old != NULL && strcmp(loop_event->devpath, event->devpath_old) == 0) {
 			event->delaying_seqnum = loop_event->seqnum;
@@ -501,6 +507,11 @@ static bool is_devpath_busy(struct event *event)
 
 		/* identical device event found */
 		if (loop_event->devpath_len == event->devpath_len) {
+			/* devices names might have changed/swapped in the meantime */
+			if (major(event->devnum) != 0 && (event->devnum != loop_event->devnum || event->is_block != loop_event->is_block))
+				continue;
+			if (event->ifindex != 0 && event->ifindex != loop_event->ifindex)
+				continue;
 			event->delaying_seqnum = loop_event->seqnum;
 			return true;
 		}
@@ -1087,6 +1098,10 @@ int main(int argc, char *argv[])
 	chdir("/");
 	umask(022);
 
+	/* create standard links, copy static nodes, create nodes from modules */
+	static_dev_create(udev);
+	static_dev_create_from_modules(udev);
+
 	/* before opening new files, make sure std{in,out,err} fds are in a sane state */
 	fd = open("/dev/null", O_RDWR);
 	if (fd < 0) {
@@ -1253,8 +1268,6 @@ int main(int argc, char *argv[])
 	}
 	info(udev, "set children_max to %u\n", children_max);
 
-	static_dev_create(udev);
-	static_dev_create_from_modules(udev);
 	udev_rules_apply_static_dev_perms(rules);
 
 	udev_list_init(&event_list);