summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-04-20 17:30:30 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-04-20 17:30:30 +0200
commit5e8176e1569de2469321f63aee1765e51bc5ded0 (patch)
treec24bc601ef716db64e46937029f7fc9681a77802
parentead7c62ab7641e150c6d668f939c102a6771ce60 (diff)
udevd: netif rename - use ifindex for temporary name
-rw-r--r--TODO2
-rw-r--r--udev/udev-event.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/TODO b/TODO
index 6bcec816c8..0ecc9c1506 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
- empty rules files and link to /dev/null are ok
- - rename netif with ifindex not devname
-
- kill tabs?
- remove deprecated trigger --type=failed logic
diff --git a/udev/udev-event.c b/udev/udev-event.c
index e583cec292..dfd5c37857 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -868,7 +868,7 @@ static int rename_netif(struct udev_event *event)
goto out;
/* free our own name, another process may wait for us */
- util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL);
+ snprintf(ifr.ifr_newname, IFNAMSIZ, "rename%u", udev_device_get_ifindex(dev));
err = ioctl(sk, SIOCSIFNAME, &ifr);
if (err < 0) {
err = -errno;