Rebase patch for v187

diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index 1c62171713a1e1bcc1e5b911c473fd94b08db43d..3c885ffc05cb0f6e06a372d4d8f5d719b72ea381 100644 (file)
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -24,7 +24,7 @@ Date: Thu, 05 Jul 2012 15:40:50 +0000
 Subject: udev: network device renaming - immediately give up if the target name isn't available
 
 diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
-index 2b9fdf6..aff1487 100644
+index 2ade0ab..aff1487 100644
 --- a/src/udev/udev-event.c
 +++ b/src/udev/udev-event.c
 @@ -745,11 +745,32 @@ out:
@@ -65,7 +65,7 @@ index 2b9fdf6..aff1487 100644
          util_strscpy(ifr.ifr_newname, IFNAMSIZ, event->name);
          err = ioctl(sk, SIOCSIFNAME, &ifr);
 -        if (err >= 0) {
--                print_kmsg("renamed network interface %s to %s\n", ifr.ifr_name, ifr.ifr_newname);
+-                print_kmsg("renamed network interface %s to %s", ifr.ifr_name, ifr.ifr_newname);
 -        } else {
 +        if (err == 0) {
 +                rename_netif_kernel_log(ifr);