src/patches/udev-141_no_netif_rename.patch

   1 diff -Naur udev-141.org/udev/udev-event.c udev-141/udev/udev-event.c
   2 --- udev-141.org/udev/udev-event.c      2009-02-24 15:08:35.000000000 +0100
   3 +++ udev-141/udev/udev-event.c  2012-10-30 12:27:00.262833136 +0100
   4 @@ -486,45 +486,8 @@
   5         if (err == 0)
   6                 rename_netif_kernel_log(ifr);
   7         else {
   8 -               int loop;
   9 -
  10 -               /* see if the destination interface name already exists */
  11 -               if (errno != EEXIST) {
  12 -                       err(event->udev, "error changing netif name %s to %s: %m\n",
  13 -                           ifr.ifr_name, ifr.ifr_newname);
  14 -                       goto exit;
  15 -               }
  16 -
  17 -               /* free our own name, another process may wait for us */
  18 -               util_strlcpy(ifr.ifr_newname, udev_device_get_sysname(dev), IFNAMSIZ);
  19 -               util_strlcat(ifr.ifr_newname, "_rename", IFNAMSIZ);
  20 -               err = ioctl(sk, SIOCSIFNAME, &ifr);
  21 -               if (err != 0) {
  22 -                       err(event->udev, "error changing netif name %s to %s: %m\n",
  23 +               err(event->udev, "error changing netif name %s to %s: %m\n",
  24                             ifr.ifr_name, ifr.ifr_newname);
  25 -                       goto exit;
  26 -               }
  27 -
  28 -               /* wait 90 seconds for our target to become available */
  29 -               util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
  30 -               util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ);
  31 -               loop = 90 * 20;
  32 -               while (loop--) {
  33 -                       err = ioctl(sk, SIOCSIFNAME, &ifr);
  34 -                       if (err == 0) {
  35 -                               rename_netif_kernel_log(ifr);
  36 -                               break;
  37 -                       }
  38 -
  39 -                       if (errno != EEXIST) {
  40 -                               err(event->udev, "error changing net interface name %s to %s: %m\n",
  41 -                                   ifr.ifr_name, ifr.ifr_newname);
  42 -                               break;
  43 -                       }
  44 -                       dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
  45 -                           event->name, (90 * 20) - loop);
  46 -                       usleep(1000 * 1000 / 20);
  47 -               }
  48         }
  49  exit:
  50         close(sk);