udevd: use dev_t or netif ifindex as database key

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 1ecf82423f256d6e8cbeaa24d3084d5649be1321..f41f06b16a0b29a93d6c5e4f0bf3cba3a2a0db85 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -454,8 +454,8 @@ static void rename_netif_kernel_log(struct ifreq ifr)
                return;
        }
 
-       fprintf(f, "<6>udev: renamed network interface %s to %s\n",
-               ifr.ifr_name, ifr.ifr_newname);
+       fprintf(f, "<6>udev[%u]: renamed network interface %s to %s\n",
+               getpid(), ifr.ifr_name, ifr.ifr_newname);
        fclose(f);
 }
 
@@ -472,8 +472,9 @@ static int rename_netif(struct udev_event *event)
 
        sk = socket(PF_INET, SOCK_DGRAM, 0);
        if (sk < 0) {
+               err = -errno;
                err(event->udev, "error opening socket: %m\n");
-               return -errno;
+               return err;
        }
 
        memset(&ifr, 0x00, sizeof(struct ifreq));
@@ -534,13 +535,8 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
        struct udev_device *dev = event->dev;
        int err = 0;
 
-       if (udev_device_get_sysname_old(dev) != NULL &&
-           strcmp(udev_device_get_sysname_old(dev), udev_device_get_sysname(dev)) != 0) {
-               udev_device_rename_db(dev);
-               info(event->udev, "moved database from '%s:%s' to '%s:%s'\n",
-                    udev_device_get_subsystem(dev), udev_device_get_sysname_old(dev),
-                    udev_device_get_subsystem(dev), udev_device_get_sysname(dev));
-       }
+       if (udev_device_get_subsystem(dev) == NULL)
+               return -1;
 
        if (strcmp(udev_device_get_action(dev), "remove") == 0) {
                udev_device_read_db(dev);