X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-event.c;h=63a8b3aa830d9db833614a7ffa678ec21aa5de18;hp=1ecf82423f256d6e8cbeaa24d3084d5649be1321;hb=17fd0f60f2735cbe1bb79ba55fed55291dd61fd2;hpb=ce9a42bec40330d0a0c83d21f07177cb2d08f1ac

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 1ecf82423..63a8b3aa8 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -454,8 +454,8 @@ static void rename_netif_kernel_log(struct ifreq ifr)
 		return;
 	}
 
-	fprintf(f, "<6>udev: renamed network interface %s to %s\n",
-		ifr.ifr_name, ifr.ifr_newname);
+	fprintf(f, "<30>udev[%u]: renamed network interface %s to %s\n",
+		getpid(), ifr.ifr_name, ifr.ifr_newname);
 	fclose(f);
 }
 
@@ -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,16 +535,11 @@ 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_sysname_old(dev) != NULL &&
-	    strcmp(udev_device_get_sysname_old(dev), udev_device_get_sysname(dev)) != 0) {
-		udev_device_rename_db(dev);
-		info(event->udev, "moved database from '%s:%s' to '%s:%s'\n",
-		     udev_device_get_subsystem(dev), udev_device_get_sysname_old(dev),
-		     udev_device_get_subsystem(dev), udev_device_get_sysname(dev));
-	}
+	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_read_db(dev, NULL);
 		udev_device_delete_db(dev);
 		udev_device_tag_index(dev, NULL, false);
 
@@ -557,7 +553,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 	} else {
 		event->dev_db = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
 		if (event->dev_db != NULL) {
-			udev_device_read_db(event->dev_db);
+			udev_device_read_db(event->dev_db, NULL);
 			udev_device_set_info_loaded(event->dev_db);
 
 			/* disable watch during event processing */
@@ -568,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;
@@ -635,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);
@@ -652,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;
 	}