shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-03 01:17:45 +03:00
Code

Revert "udev: import the full db on MOVE events for devices without dev_t"

Browse Source 
This reverts commit b081b27e14.

If a network interface get a 'move' event, then previously SYSTEMD_ALIAS=
property still contains an old alias, and the old alias .device unit
will not be removed.

This makes all properties cleared on 'move' event, and then old alias
.device unit will be removed by pid1.

Fixes #16967.
This commit is contained in:
Yu Watanabe 2020-09-14 15:20:04 +09:00
parent 2e17fed5f3
commit 51d9aec0ff
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/udev/udev-event.c
View File

@ -940,16 +940,9 @@ static void event_execute_rules_on_remove(
(void) udev_node_remove(dev);
}
static int udev_event_on_move(UdevEvent *event) {
sd_device *dev = event->dev;
static int udev_event_on_move(sd_device *dev) {
int r;
if (sd_device_get_devnum(dev, NULL) < 0) {
r = device_copy_properties(dev, event->dev_db_clone);
if (r < 0)
log_device_debug_errno(dev, r, "Failed to copy properties from cloned sd_device object, ignoring: %m");
}
/* Drop previously added property */
r = device_add_property(dev, "ID_RENAMING", NULL);
if (r < 0)
@ -1017,7 +1010,7 @@ int udev_event_execute_rules(UdevEvent *event,
(void) udev_watch_end(event->dev_db_clone);
if (action == DEVICE_ACTION_MOVE) {
r = udev_event_on_move(event);
r = udev_event_on_move(event->dev);
if (r < 0)
return r;
}