update %n on netif name change

diff --git a/udev_device.c b/udev_device.c
index 24f65ca045d2c39f170c7f0093b2fba2745966db..03514e1d48bbc0c2ed2ff05816d9628a622ac1ec 100644 (file)
--- a/udev_device.c
+++ b/udev_device.c
@@ -204,6 +204,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 +215,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;

diff --git a/udev_rules.c b/udev_rules.c
index ea02b8e9455763ae9346dfc96a2661ecc2f44b97..f8844a8438df8af7ae277c248489ece37d145d7e 100644 (file)
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -289,7 +289,7 @@ static int wait_for_sysfs(struct udevice *udev, const char *file, int timeout)
                        info("file '%s' appeared after %i loops", filepath, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
                        return 0;
                }
-               /* make sure the device does not have disappeared in the meantime */
+               /* make sure, the device did not disappear in the meantime */
                if (stat(devicepath, &stats) != 0) {
                        info("device disappeared while waiting for '%s'", filepath);
                        return -2;

diff --git a/udev_sysfs.c b/udev_sysfs.c
index 7431dd6111692ec0afcd73ff2af56626a6b43747..1846a42f6accd18be58a73297a81119b179713c3 100644 (file)
--- a/udev_sysfs.c
+++ b/udev_sysfs.c
@@ -92,7 +92,6 @@ void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath,
        pos = strrchr(dev->devpath, '/');
        if (pos == NULL)
                return;
-
        strlcpy(dev->kernel, &pos[1], sizeof(dev->kernel));
        dbg("kernel='%s'", dev->kernel);