X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fsysinfo.c;h=be4543832265a964ceea26124dbcdc1a8d85a2c9;hp=19dac57f02fb26757948605f716a2e94ba44550a;hb=23f75c74abde1b336e470d3febe68a45bfa68c5b;hpb=bc4114e2235163bd88456c25cc0a908d86151f93

diff --git a/discover/sysinfo.c b/discover/sysinfo.c
index 19dac57..be45438 100644
--- a/discover/sysinfo.c
+++ b/discover/sysinfo.c
@@ -2,6 +2,7 @@
 #include <string.h>
 
 #include <talloc/talloc.h>
+#include <process/process.h>
 
 #include "discover-server.h"
 #include "sysinfo.h"
@@ -9,18 +10,22 @@
 static struct system_info *sysinfo;
 static struct discover_server *server;
 
+static const char *sysinfo_helper = PKG_LIBEXEC_DIR "/pb-sysinfo";
+
 const struct system_info *system_info_get(void)
 {
 	return sysinfo;
 }
 
 void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr,
-		const char *name)
+		const char *name, bool link)
 {
 	struct interface_info *if_info;
 	unsigned int i;
 
 	for (i = 0; i < sysinfo->n_interfaces; i++) {
+		bool changed = false;
+
 		if_info = sysinfo->interfaces[i];
 
 		if (if_info->hwaddr_size != hwaddr_size)
@@ -29,10 +34,22 @@ void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr,
 		if (memcmp(if_info->hwaddr, hwaddr, hwaddr_size))
 			continue;
 
-		/* update the name and we're done */
-		talloc_free(if_info->name);
-		if_info->name = talloc_strdup(if_info, name);
-		discover_server_notify_system_info(server, sysinfo);
+		/* Found an existing interface. Notify clients on any name or
+		 * link changes */
+		if (strcmp(if_info->name, name)) {
+			talloc_free(if_info->name);
+			if_info->name = talloc_strdup(if_info, name);
+			changed = true;
+		}
+
+		if (if_info->link != link) {
+			if_info->link = link;
+			changed = true;
+		}
+
+		if (changed)
+			discover_server_notify_system_info(server, sysinfo);
+
 		return;
 	}
 
@@ -40,6 +57,7 @@ void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr,
 	if_info->hwaddr_size = hwaddr_size;
 	if_info->hwaddr = talloc_memdup(if_info, hwaddr, hwaddr_size);
 	if_info->name = talloc_strdup(if_info, name);
+	if_info->link = link;
 
 	sysinfo->n_interfaces++;
 	sysinfo->interfaces = talloc_realloc(sysinfo, sysinfo->interfaces,
@@ -50,15 +68,75 @@ void system_info_register_interface(unsigned int hwaddr_size, uint8_t *hwaddr,
 	discover_server_notify_system_info(server, sysinfo);
 }
 
-static void system_info_set_identifier(struct system_info *info
-		__attribute__((unused)))
+void system_info_register_blockdev(const char *name, const char *uuid,
+		const char *mountpoint)
 {
-	/* todo: call helpers to set type & id */
+	struct blockdev_info *bd_info;
+	unsigned int i;
+
+	for (i = 0; i < sysinfo->n_blockdevs; i++) {
+		bd_info = sysinfo->blockdevs[i];
+
+		if (strcmp(bd_info->name, name))
+			continue;
+
+		/* update the mountpoint and UUID, and we're done */
+		talloc_free(bd_info->mountpoint);
+		bd_info->uuid = talloc_strdup(bd_info, uuid);
+		bd_info->mountpoint = talloc_strdup(bd_info, mountpoint);
+		discover_server_notify_system_info(server, sysinfo);
+		return;
+	}
+
+	bd_info = talloc_zero(sysinfo, struct blockdev_info);
+	bd_info->name = talloc_strdup(bd_info, name);
+	bd_info->uuid = talloc_strdup(bd_info, uuid);
+	bd_info->mountpoint = talloc_strdup(bd_info, mountpoint);
+
+	sysinfo->n_blockdevs++;
+	sysinfo->blockdevs = talloc_realloc(sysinfo, sysinfo->blockdevs,
+						struct blockdev_info *,
+						sysinfo->n_blockdevs);
+	sysinfo->blockdevs[sysinfo->n_blockdevs - 1] = bd_info;
+
+	discover_server_notify_system_info(server, sysinfo);
+}
+
+static void system_info_set_identifier(struct system_info *info)
+{
+	struct process *process;
+	int rc;
+	const char *argv[] = {
+		sysinfo_helper, NULL, NULL,
+	};
+
+	process = process_create(info);
+	process->path = sysinfo_helper;
+	process->argv = argv;
+	process->keep_stdout = true;
+
+	argv[1] = "--type";
+	rc = process_run_sync(process);
+
+	if (!rc) {
+		info->type = talloc_strndup(info, process->stdout_buf,
+				process->stdout_len);
+	}
+
+	argv[1] = "--id";
+	rc = process_run_sync(process);
+
+	if (!rc) {
+		info->identifier = talloc_strndup(info, process->stdout_buf,
+				process->stdout_len);
+	}
+
+	process_release(process);
 }
 
 void system_info_init(struct discover_server *s)
 {
-	sysinfo = talloc_zero(server, struct system_info);
 	server = s;
+	sysinfo = talloc_zero(server, struct system_info);
 	system_info_set_identifier(sysinfo);
 }