X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=0dad087bb4199a3d2ed15510bad1f0b43cc1f1ab;hp=c9460ac5ae4a0802c15eebf9a1c3c948a5eaabf8;hb=6bb1301835dbd6ff54e1becb5b684fedb0e4caaf;hpb=052961eb2e8279f103c091e850c317da335c0207

diff --git a/discover/network.c b/discover/network.c
index c9460ac..0dad087 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -109,6 +109,19 @@ static struct interface *find_interface_by_name(struct network *network,
 	return NULL;
 }
 
+uint8_t *find_mac_by_name(void *ctx, struct network *network,
+		const char *name)
+{
+	struct interface *interface;
+
+	interface = find_interface_by_name(network, name);
+	if (!interface)
+		return NULL;
+
+	return talloc_memdup(ctx, &interface->hwaddr,
+			     sizeof(uint8_t) * HWADDR_SIZE);
+}
+
 static int network_init_netlink(struct network *network)
 {
 	struct sockaddr_nl addr;
@@ -497,6 +510,15 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 		add_interface(network, interface);
 	}
 
+	/* A repeated RTM_NEWLINK can represent an interface name change */
+	if (strncmp(interface->name, ifname, IFNAMSIZ)) {
+		pb_debug("ifname update: %s -> %s\n", interface->name, ifname);
+		strncpy(interface->name, ifname, sizeof(interface->name) - 1);
+		talloc_free(interface->dev->device->id);
+		interface->dev->device->id =
+			talloc_strdup(interface->dev->device, ifname);
+	}
+
 	/* notify the sysinfo code about changes to this interface */
 	if (strcmp(interface->name, "lo"))
 		system_info_register_interface(