X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=60d1f6e0f4e1790ba4b2bb2b18bd3a7b81efe70b;hp=9da0f7a72526837011c67191152e4653c048e12c;hb=ae3c354e844698bdb4ed35a6845aa9dca1e9205f;hpb=c14b12980885edd035322cd3bc87efff444c39b1

diff --git a/discover/network.c b/discover/network.c
index 9da0f7a..60d1f6e 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -181,6 +181,15 @@ static int interface_change(struct interface *interface, bool up)
 		process_release(interface->udhcpc_process);
 	}
 
+	if (!up) {
+		rc = process_run_simple(interface, pb_system_apps.ip,
+				"address", "flush", "dev", interface->name,
+				NULL);
+		if (rc)
+			pb_log("failed to flush addresses from interface %s\n",
+				interface->name);
+	}
+
 	rc = process_run_simple(interface, pb_system_apps.ip,
 			"link", "set", interface->name, statestr, NULL);
 	if (rc) {
@@ -212,23 +221,32 @@ static void udhcpc_process_exit(struct process *process)
 
 static void configure_interface_dhcp(struct interface *interface)
 {
+	const struct platform *platform;
+	char pidfile[256], id[10];
 	struct process *process;
-	char pidfile[256];
 	int rc;
 	const char *argv[] = {
 		pb_system_apps.udhcpc,
 		"-R",
 		"-n",
+		"-f",
 		"-O", "pxeconffile",
 		"-O", "pxepathprefix",
-		"-x", "0x5d:000a",
 		"-p", pidfile,
 		"-i", interface->name,
+		"-x", id, /* [11,12] - dhcp client identifier */
 		NULL,
 	};
+
 	snprintf(pidfile, sizeof(pidfile), "%s/udhcpc-%s.pid",
 			PIDFILE_BASE, interface->name);
 
+	platform = platform_get();
+	if (platform && platform->dhcp_arch_id != 0xffff)
+		snprintf(id, sizeof(id), "0x5d:%04x", platform->dhcp_arch_id);
+	else
+		argv[11] = NULL;
+
 	process = process_create(interface);
 
 	process->path = pb_system_apps.udhcpc;
@@ -525,7 +543,7 @@ static void network_init_dns(struct network *network)
 		buf = talloc_realloc(network, buf, char, len + dns_conf_len + 1);
 		memcpy(buf + len, dns_conf, dns_conf_len);
 		len += dns_conf_len;
-		buf[len - 1] = '\0';
+		buf[len] = '\0';
 		modified = true;
 
 		talloc_free(dns_conf);
@@ -576,7 +594,6 @@ err:
 	return NULL;
 }
 
-
 int network_shutdown(struct network *network)
 {
 	struct interface *interface;