X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fnetwork.c;h=c300f3dc7719619aa6092df5b476837ff8177b74;hp=bc7e186a1921e8531bb2fd37ed026f5e47e5977e;hb=702f9c313dea66817cf05196d84cd07889e80c51;hpb=d67d5beceef94686818ce264b2ca93f82b66e8f4

diff --git a/discover/network.c b/discover/network.c
index bc7e186..c300f3d 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -14,13 +14,13 @@
 #include <types/types.h>
 #include <talloc/talloc.h>
 #include <waiter/waiter.h>
-#include <pb-config/pb-config.h>
 #include <process/process.h>
 #include <system/system.h>
 
 #include "file.h"
 #include "network.h"
 #include "sysinfo.h"
+#include "platform.h"
 #include "device-handler.h"
 
 #define HWADDR_SIZE	6
@@ -212,21 +212,31 @@ 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",
 		"-O", "pxeconffile",
+		"-O", "pxepathprefix",
 		"-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;
@@ -416,14 +426,15 @@ static int network_handle_nlmsg(struct network *network, struct nlmsghdr *nlmsg)
 		memcpy(interface->hwaddr, ifaddr, sizeof(interface->hwaddr));
 		strncpy(interface->name, ifname, sizeof(interface->name) - 1);
 		add_interface(network, interface);
-
-		/* tell the sysinfo code about this interface */
-		if (strcmp(interface->name, "lo"))
-			system_info_register_interface(
-					sizeof(interface->hwaddr),
-					interface->hwaddr, interface->name);
 	}
 
+	/* notify the sysinfo code about changes to this interface */
+	if (strcmp(interface->name, "lo"))
+		system_info_register_interface(
+				sizeof(interface->hwaddr),
+				interface->hwaddr, interface->name,
+				info->ifi_flags & IFF_LOWER_UP);
+
 	configure_interface(network, interface,
 			info->ifi_flags & IFF_UP,
 			info->ifi_flags & IFF_LOWER_UP);
@@ -581,8 +592,13 @@ int network_shutdown(struct network *network)
 	if (network->waiter)
 		waiter_remove(network->waiter);
 
-	list_for_each_entry(&network->interfaces, interface, list)
+	list_for_each_entry(&network->interfaces, interface, list) {
+		if (interface->state == IFSTATE_IGNORED)
+			continue;
+		if (!strcmp(interface->name, "lo"))
+			continue;
 		interface_down(interface);
+	}
 
 	close(network->netlink_sd);
 	talloc_free(network);