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

diff --git a/discover/sysinfo.c b/discover/sysinfo.c
index 19dac57..3c13277 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,6 +10,8 @@
 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;
@@ -50,15 +53,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)
+{
+	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)
 {
-	/* todo: call helpers to set type & id */
+	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);
 }