X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-event.c;h=100a79c1e84e1435b0c11fa8e29dbcc44f86217d;hb=95ce1875d79162324a5eb67f6a0ffbbdd5d29921;hp=ae523f83c5727249c6b7afae7c018780a698cb52;hpb=c25bfbfb1b20781698ff3c8cbc884a9e190052ee;p=elogind.git

diff --git a/udev/udev-event.c b/udev/udev-event.c
index ae523f83c..100a79c1e 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -472,8 +472,9 @@ static int rename_netif(struct udev_event *event)
 
 	sk = socket(PF_INET, SOCK_DGRAM, 0);
 	if (sk < 0) {
+		err = -errno;
 		err(event->udev, "error opening socket: %m\n");
-		return -errno;
+		return err;
 	}
 
 	memset(&ifr, 0x00, sizeof(struct ifreq));
@@ -534,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);
@@ -560,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;
@@ -627,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);
@@ -644,6 +643,17 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 			err = udev_node_add(dev, event->mode, event->uid, event->gid);
 		}
 
+		/* preserve old, or get new initialization timestamp */
+		if (event->dev_db != NULL && udev_device_get_usec_initialized(event->dev_db) > 0)
+			udev_device_set_usec_initialized(event->dev, udev_device_get_usec_initialized(event->dev_db));
+		else
+			udev_device_set_usec_initialized(event->dev, usec_monotonic());
+
+		/* (re)write database file */
+		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;
 	}