X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_device.c;h=87f90c76769b714320381368ab9cf02649c2030e;hp=3c4ac913ed8839abce78bc5939b3390b20bf2490;hb=1aa0c52b4458be4cf6e55b2faf5c602761f5d3a3;hpb=b879c303a787e9430a5234aff3c1185ff9a4b019

diff --git a/udev_device.c b/udev_device.c
index 3c4ac913e..87f90c767 100644
--- a/udev_device.c
+++ b/udev_device.c
@@ -106,7 +106,7 @@ static int rename_netif(struct udevice *udev)
 
 		/* see if the destination interface name already exists */
 		if (errno != EEXIST) {
-			err("error changing netif name: %s", strerror(errno));
+			err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
 			goto exit;
 		}
 
@@ -115,7 +115,7 @@ static int rename_netif(struct udevice *udev)
 		strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ);
 		retval = ioctl(sk, SIOCSIFNAME, &ifr);
 		if (retval != 0) {
-			err("error changing netif name: %s", strerror(errno));
+			err("error changing netif name %s to %s: %s", ifr.ifr_name, ifr.ifr_newname, strerror(errno));
 			goto exit;
 		}
 
@@ -127,7 +127,8 @@ static int rename_netif(struct udevice *udev)
 			retval = ioctl(sk, SIOCSIFNAME, &ifr);	
 			if (retval != 0) {
 				if (errno != EEXIST) {
-					err("error changing net interface name: %s", strerror(errno));
+					err("error changing net interface name %s to %s: %s",
+					    ifr.ifr_name, ifr.ifr_newname, strerror(errno));
 					break;
 				}
 				dbg("wait for netif '%s' to become free, loop=%i", udev->name, (30 * 20) - loop);
@@ -147,7 +148,7 @@ int udev_device_event(struct udev_rules *rules, struct udevice *udev)
 
 	/* add device node */
 	if (major(udev->devt) != 0 &&
-	    (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "online") == 0)) {
+	    (strcmp(udev->action, "add") == 0 || strcmp(udev->action, "change") == 0)) {
 		struct udevice *udev_old;
 
 		dbg("device node add '%s'", udev->dev->devpath);