diff options
| -rw-r--r-- | src/libudev/libudev-device.c | 22 | ||||
| -rw-r--r-- | src/libudev/libudev-private.h | 1 | ||||
| -rw-r--r-- | src/udev/udev-event.c | 28 |
3 files changed, 38 insertions, 13 deletions
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c index a7446bff77..193c706d89 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -1922,3 +1922,25 @@ void udev_device_set_db_persist(struct udev_device *udev_device) { udev_device->db_persist = true; } + +int udev_device_rename(struct udev_device *udev_device, const char *name) +{ + _cleanup_free_ char *dirname = NULL; + char *new_syspath; + int r; + + if (udev_device == NULL || name == NULL) + return -EINVAL; + + dirname = dirname_malloc(udev_device->syspath); + if (!dirname) + return -ENOMEM; + + new_syspath = strappenda(dirname, "/", name); + + r = udev_device_set_syspath(udev_device, new_syspath); + if (r < 0) + return r; + + return 0; +} diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h index d188bdad20..017b6cc63b 100644 --- a/src/libudev/libudev-private.h +++ b/src/libudev/libudev-private.h @@ -43,6 +43,7 @@ uid_t udev_device_get_devnode_uid(struct udev_device *udev_device); gid_t udev_device_get_devnode_gid(struct udev_device *udev_device); int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem); int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath); +int udev_device_rename(struct udev_device *udev_device, const char *new_name); int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum); int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink); void udev_device_cleanup_devlinks_list(struct udev_device *udev_device); diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index beb09439c7..e5b2259fda 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -846,23 +846,25 @@ void udev_event_execute_rules(struct udev_event *event, /* rename a new network interface, if needed */ if (udev_device_get_ifindex(dev) > 0 && streq(udev_device_get_action(dev), "add") && event->name != NULL && !streq(event->name, udev_device_get_sysname(dev))) { - char syspath[UTIL_PATH_SIZE]; - char *pos; int r; r = rename_netif(event); - if (r >= 0) { - /* remember old name */ - udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev)); + if (r < 0) + log_warning_errno(r, "could not rename interface '%d' from '%s' to '%s': %m", udev_device_get_ifindex(dev), + udev_device_get_sysname(dev), event->name); + else { + const char *interface_old; - /* now change the devpath, because the kernel device name has changed */ - strscpy(syspath, sizeof(syspath), udev_device_get_syspath(dev)); - pos = strrchr(syspath, '/'); - if (pos != NULL) { - pos++; - strscpy(pos, sizeof(syspath) - (pos - syspath), event->name); - udev_device_set_syspath(event->dev, syspath); - udev_device_add_property(dev, "INTERFACE", udev_device_get_sysname(dev)); + /* remember old name */ + interface_old = udev_device_get_sysname(dev); + + r = udev_device_rename(dev, event->name); + if (r < 0) + log_warning_errno(r, "renamed interface '%d' from '%s' to '%s', but could not update udev_device: %m", + udev_device_get_ifindex(dev), udev_device_get_sysname(dev), event->name); + else { + udev_device_add_property(dev, "INTERFACE_OLD", interface_old); + udev_device_add_property(dev, "INTERFACE", event->name); log_debug("changed devpath to '%s'", udev_device_get_devpath(dev)); } } |