From: Harald Hoyer <harald@redhat.com>
Date: Fri, 18 Sep 2009 11:14:30 +0000 (+0200)
Subject: rename interfaces to <iface>_rename if rename fails
X-Git-Tag: 174~764
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6068553195f43a2fd7987c48178de23b63a09f15

rename interfaces to <iface>_rename if rename fails
---

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 701c06182..d5b4d0941 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -492,8 +492,7 @@ static int rename_netif(struct udev_event *event)
 		}
 
 		/* free our own name, another process may wait for us */
-		util_strscpy(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev));
-		util_strscpy(ifr.ifr_newname, IFNAMSIZ, "_rename");
+		util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "_rename", NULL);
 		err = ioctl(sk, SIOCSIFNAME, &ifr);
 		if (err != 0) {
 			err(event->udev, "error changing netif name %s to %s: %m\n",