X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_device.c;h=62217ff58509564aea08c219461f41fdabeb0c77;hb=b2d1ae727e78ac3e22caa11798360d87775095ff;hp=24f65ca045d2c39f170c7f0093b2fba2745966db;hpb=24f0605c1fec98b77eddb880a405289b08cb5670;p=elogind.git

diff --git a/udev_device.c b/udev_device.c
index 24f65ca04..62217ff58 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -78,6 +78,26 @@ dev_t udev_device_get_devt(struct udevice *udev)
 	return makedev(0, 0);
 }
 
+static void kernel_log(struct ifreq ifr)
+{
+	int klog;
+	FILE *f;
+
+	klog = open("/dev/kmsg", O_WRONLY);
+	if (klog < 0)
+		return;
+
+	f = fdopen(klog, "w");
+	if (f == NULL) {
+		close(klog);
+		return;
+	}
+
+	fprintf(f, "<6>udev: renamed network interface %s to %s\n",
+		ifr.ifr_name, ifr.ifr_newname);
+	fclose(f);
+}
+
 static int rename_netif(struct udevice *udev)
 {
 	int sk;
@@ -98,7 +118,9 @@ static int rename_netif(struct udevice *udev)
 	strlcpy(ifr.ifr_name, udev->dev->kernel, IFNAMSIZ);
 	strlcpy(ifr.ifr_newname, udev->name, IFNAMSIZ);
 	retval = ioctl(sk, SIOCSIFNAME, &ifr);
-	if (retval != 0) {
+	if (retval == 0)
+		kernel_log(ifr);
+	else {
 		int loop;
 
 		/* see if the destination interface name already exists */
@@ -122,8 +144,10 @@ static int rename_netif(struct udevice *udev)
 		loop = 30 * 20;
 		while (loop--) {
 			retval = ioctl(sk, SIOCSIFNAME, &ifr);
-			if (retval == 0)
+			if (retval == 0) {
+				kernel_log(ifr);
 				break;
+			}
 
 			if (errno != EEXIST) {
 				err("error changing net interface name %s to %s: %s",
@@ -144,6 +168,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 {
 	int retval = 0;
 
+	if (udev->devpath_old != NULL)
+		if (udev_db_rename(udev->devpath_old, udev->dev->devpath) == 0)
+			info("moved database from '%s' to '%s'", udev->devpath_old, udev->dev->devpath);
+
 	/* add device node */
 	if (major(udev->devt) != 0 &&
 	    (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
@@ -164,6 +192,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		/* read current database entry; cleanup, if it is known device */
 		udev_old = udev_device_init(NULL);
 		if (udev_old != NULL) {
+			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);
@@ -204,6 +233,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);
@@ -214,14 +244,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;
@@ -234,10 +266,6 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 		/* 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;
-			}
 			/* restore stored persistent data */
 			list_for_each_entry(name_loop, &udev->env_list, node)
 				putenv(name_loop->name);
@@ -253,6 +281,10 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 			goto exit;
 		}
 
+		if (udev->ignore_remove) {
+			info("ignore_remove for '%s'", udev->name);
+			goto exit;
+		}
 		/* remove the node */
 		retval = udev_node_remove(udev);