picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

udev/libudev: event - move {OLD_,}INTERFACE handling from udevd to libudev

Browse source 
This should be internal to the library as it is only about reflecting the sysfs state in the udev_device.
This commit is contained in:
Tom Gundersen 2015-03-05 17:44:12 +01:00
parent bd57b6de74
commit 3738cc858d
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libudev/libudev-device.c
View file

@ -1926,6 +1926,7 @@ void udev_device_set_db_persist(struct udev_device *udev_device)
int udev_device_rename(struct udev_device *udev_device, const char *name)
{
_cleanup_free_ char *dirname = NULL;
const char *interface;
char *new_syspath;
int r;
@ -1942,6 +1943,13 @@ int udev_device_rename(struct udev_device *udev_device, const char *name)
if (r < 0)
return r;
interface = udev_device_get_property_value(udev_device, "INTERFACE");
if (interface) {
/* like DEVPATH_OLD, INTERFACE_OLD is not saved to the db, but only stays around for the current event */
udev_device_add_property(udev_device, "INTERFACE_OLD", interface);
udev_device_add_property(udev_device, "INTERFACE", name);
}
return 0;
}

10
src/udev/udev-event.c
View file

@ -849,20 +849,12 @@ void udev_event_execute_rules(struct udev_event *event,
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;
/* 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);
else
log_debug("changed devpath to '%s'", udev_device_get_devpath(dev));
}
}
}