X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-event.c;h=4d38c5b893effab649237417b044f8e17c6b1c76;hp=064873531b79d3f5a735ac52ec64868cecdb631d;hb=48a0170b111b55e961be769d2cc4890511bcd991;hpb=1c2311c5568ddc6c3010afc02e5894e9b22a1c51

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 064873531..4d38c5b89 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -535,6 +535,9 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 	struct udev_device *dev = event->dev;
 	int err = 0;
 
+	if (udev_device_get_subsystem(dev) == NULL)
+		return -1;
+
 	if (strcmp(udev_device_get_action(dev), "remove") == 0) {
 		udev_device_read_db(dev);
 		udev_device_delete_db(dev);
@@ -561,7 +564,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 		udev_rules_apply_to_event(rules, event);
 
 		/* rename a new network interface, if needed */
-		if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0 &&
+		if (udev_device_get_ifindex(dev) > 0 && strcmp(udev_device_get_action(dev), "add") == 0 &&
 		    event->name != NULL && strcmp(event->name, udev_device_get_sysname(dev)) != 0) {
 			char syspath[UTIL_PATH_SIZE];
 			char *pos;
@@ -628,12 +631,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 			/* set device node name */
 			util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", event->name, NULL);
 			udev_device_set_devnode(dev, filename);
-		}
-
-		udev_device_update_db(dev);
-		udev_device_tag_index(dev, event->dev_db, true);
 
-		if (major(udev_device_get_devnum(dev)) != 0) {
 			/* remove/update possible left-over symlinks from old database entry */
 			if (event->dev_db != NULL)
 				udev_node_update_old_links(dev, event->dev_db);
@@ -645,6 +643,10 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 			err = udev_node_add(dev, event->mode, event->uid, event->gid);
 		}
 
+		udev_device_update_db(dev);
+		udev_device_tag_index(dev, event->dev_db, true);
+		udev_device_set_is_initialized(dev);
+
 		udev_device_unref(event->dev_db);
 		event->dev_db = NULL;
 	}