X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=c072eece9627408ac7bbebab2d227d968a8f9fbf;hp=3946694615fd4d931352610fd8abbafafd8a8264;hb=f155a58a64c660e46e74123293482561b816a39a;hpb=9c33c54f7b431074a7d0daddce34140044aaadf6

diff --git a/discover/network.c b/discover/network.c
index 3946694..c072eec 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -336,7 +336,8 @@ static void configure_interface_dhcp(struct interface *interface)
 	return;
 }
 
-static void configure_interface_static(struct interface *interface,
+static void configure_interface_static(struct network *network,
+		struct interface *interface,
 		const struct interface_config *config)
 {
 	int rc;
@@ -370,6 +371,16 @@ static void configure_interface_static(struct interface *interface,
 				interface->name);
 	}
 
+	if (config->static_config.url) {
+		pb_log("config URL %s\n", config->static_config.url);
+		device_handler_process_url(network->handler,
+				config->static_config.url,
+				mac_bytes_to_string(interface->dev,
+						interface->hwaddr,
+						sizeof(interface->hwaddr)),
+				config->static_config.address);
+	}
+
 	return;
 }
 
@@ -438,7 +449,7 @@ static void configure_interface(struct network *network,
 		configure_interface_dhcp(interface);
 
 	} else if (config->method == CONFIG_METHOD_STATIC) {
-		configure_interface_static(interface, config);
+		configure_interface_static(network, interface, config);
 	}
 }
 
@@ -510,6 +521,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(