X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_device.c;h=bbf7963afce78897f38d88eca4a2b23efade9853;hp=91fa6554805d6504c6a6060e9d3cd5cbe5b6b158;hb=9ea893ae25aaedbad9b91a9f49114abcb79135b7;hpb=4a7e6bcef059af60baab92a3c0fbe01ed44465d5

diff --git a/udev_device.c b/udev_device.c
index 91fa65548..bbf7963af 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -33,11 +33,10 @@
 #include "udev_rules.h"
 
 
-struct udevice *udev_device_init(void)
+struct udevice *udev_device_init(struct udevice *udev)
 {
-	struct udevice *udev;
-
-	udev = malloc(sizeof(struct udevice));
+	if (udev == NULL)
+		udev = malloc(sizeof(struct udevice));
 	if (udev == NULL)
 		return NULL;
 	memset(udev, 0x00, sizeof(struct udevice));
@@ -162,41 +161,32 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 			goto exit;
 		}
 
-		/* read current database entry, we may want to cleanup symlinks */
-		udev_old = udev_device_init();
+		/* read current database entry; cleanup, if it is known device */
+		udev_old = udev_device_init(NULL);
 		if (udev_old != NULL) {
-			if (udev_db_get_device(udev_old, udev->dev->devpath) != 0) {
+			udev_old->test_run = udev->test_run;
+			if (udev_db_get_device(udev_old, udev->dev->devpath) == 0) {
+				info("device '%s' already in database, cleanup", udev->dev->devpath);
+				udev_db_delete_device(udev_old);
+			} else {
 				udev_device_cleanup(udev_old);
 				udev_old = NULL;
-			} else
-				info("device '%s' already in database, validate currently present symlinks",
-				     udev->dev->devpath);
-		}
-
-		/* create node and symlinks */
-		retval = udev_node_add(udev, udev_old);
-		if (retval == 0) {
-			/* store record in database */
-			udev_db_add_device(udev);
-
-			/* remove possibly left-over symlinks */
-			if (udev_old != NULL) {
-				struct name_entry *link_loop;
-				struct name_entry *link_old_loop;
-				struct name_entry *link_old_tmp_loop;
-
-				/* remove still valid symlinks from old list */
-				list_for_each_entry_safe(link_old_loop, link_old_tmp_loop, &udev_old->symlink_list, node)
-					list_for_each_entry(link_loop, &udev->symlink_list, node)
-						if (strcmp(link_old_loop->name, link_loop->name) == 0) {
-							dbg("symlink '%s' still valid, keep it", link_old_loop->name);
-							list_del(&link_old_loop->node);
-							free(link_old_loop);
-						}
-				udev_node_remove_symlinks(udev_old);
-				udev_device_cleanup(udev_old);
 			}
 		}
+
+		/* create node */
+		retval = udev_node_add(udev);
+		if (retval != 0)
+			goto exit;
+
+		/* store in database */
+		udev_db_add_device(udev);
+
+		/* create, replace, delete symlinks according to priority */
+		udev_node_update_symlinks(udev, udev_old);
+
+		if (udev_old != NULL)
+			udev_device_cleanup(udev_old);
 		goto exit;
 	}
 
@@ -215,6 +205,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 
 		/* look if we want to change the name of the netif */
 		if (strcmp(udev->name, udev->dev->kernel) != 0) {
+			char devpath[PATH_MAX];
 			char *pos;
 
 			retval = rename_netif(udev);
@@ -225,14 +216,16 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 			/* export old name */
 			setenv("INTERFACE_OLD", udev->dev->kernel, 1);
 
-			/* now fake the devpath, because the kernel name changed silently */
-			pos = strrchr(udev->dev->devpath, '/');
+			/* now change the devpath, because the kernel device name has changed */
+			strlcpy(devpath, udev->dev->devpath, sizeof(devpath));
+			pos = strrchr(devpath, '/');
 			if (pos != NULL) {
 				pos[1] = '\0';
-				strlcat(udev->dev->devpath, udev->name, sizeof(udev->dev->devpath));
-				strlcpy(udev->dev->kernel, udev->name, sizeof(udev->dev->kernel));
+				strlcat(devpath, udev->name, sizeof(devpath));
+				sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
 				setenv("DEVPATH", udev->dev->devpath, 1);
 				setenv("INTERFACE", udev->name, 1);
+				info("changed devpath to '%s'", udev->dev->devpath);
 			}
 		}
 		goto exit;
@@ -242,18 +235,19 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 	if (major(udev->devt) != 0 && strcmp(udev->action, "remove") == 0) {
 		struct name_entry *name_loop;
 
-		/* import and delete database entry */
+		/* import database entry, and delete it */
 		if (udev_db_get_device(udev, udev->dev->devpath) == 0) {
 			udev_db_delete_device(udev);
 			if (udev->ignore_remove) {
-				dbg("remove event for '%s' requested to be ignored by rule", udev->name);
-				return 0;
+				info("ignore_remove for '%s'", udev->name);
+				goto exit;
 			}
 			/* restore stored persistent data */
 			list_for_each_entry(name_loop, &udev->env_list, node)
 				putenv(name_loop->name);
 		} else {
-			dbg("'%s' not found in database, using kernel name '%s'", udev->dev->devpath, udev->dev->kernel);
+			dbg("'%s' not found in database, using kernel name '%s'",
+			    udev->dev->devpath, udev->dev->kernel);
 			strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
 		}
 
@@ -263,7 +257,11 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 			goto exit;
 		}
 
+		/* remove the node */
 		retval = udev_node_remove(udev);
+
+		/* delete or restore symlinks according to priority */
+		udev_node_update_symlinks(udev, NULL);
 		goto exit;
 	}