X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform.c;h=0a221e295bb87a67992a6ccede556fe3e49271c2;hp=db0ea61dd025c7fd6dabb93c51e12a9d434115cb;hb=8fa3f3bd22e66329ac0dd65a82bf8eb554e2364d;hpb=aa530148044a7c6d7ec7b6a32672cc69d53979b2

diff --git a/discover/platform.c b/discover/platform.c
index db0ea61..0a221e2 100644
--- a/discover/platform.c
+++ b/discover/platform.c
@@ -1,7 +1,11 @@
 
+#define _GNU_SOURCE
+
+#include <fcntl.h>
 #include <string.h>
 
 #include <log/log.h>
+#include <file/file.h>
 #include <types/types.h>
 #include <talloc/talloc.h>
 
@@ -11,6 +15,25 @@ void			*platform_ctx;
 static struct platform	*platform;
 static struct config	*config;
 
+static const char *kernel_cmdline_debug = "petitboot.debug";
+
+static const char *device_type_name(enum device_type type)
+{
+	switch (type) {
+	case DEVICE_TYPE_DISK:
+		return "disk";
+	case DEVICE_TYPE_OPTICAL:
+		return "optical";
+	case DEVICE_TYPE_NETWORK:
+		return "network";
+	case DEVICE_TYPE_ANY:
+		return "any";
+	case DEVICE_TYPE_UNKNOWN:
+	default:
+		return "unknown";
+	}
+}
+
 static void dump_config(struct config *config)
 {
 	unsigned int i;
@@ -26,6 +49,9 @@ static void dump_config(struct config *config)
 	if (config->network.n_interfaces || config->network.n_dns_servers)
 		pb_log(" network configuration:\n");
 
+	if (config->safe_mode)
+		pb_log(" safe mode: active\n");
+
 	for (i = 0; i < config->network.n_interfaces; i++) {
 		struct interface_config *ifconf =
 			config->network.interfaces[i];
@@ -52,16 +78,53 @@ static void dump_config(struct config *config)
 	}
 	for (i = 0; i < config->network.n_dns_servers; i++)
 		pb_log("  dns server %s\n", config->network.dns_servers[i]);
+
+	if (config->boot_device)
+		pb_log("  boot device %s\n", config->boot_device);
+
+	if (config->n_boot_priorities)
+		pb_log(" boot priority order:\n");
+
+	for (i = 0; i < config->n_boot_priorities; i++) {
+		struct boot_priority *prio = &config->boot_priorities[i];
+		pb_log(" %10s: %d\n", device_type_name(prio->type),
+					prio->priority);
+	}
+
+	pb_log(" language: %s\n", config->lang ?: "");
+}
+
+static bool config_debug_on_cmdline(void)
+{
+	char buf[600];
+	int rc, fd;
+
+	fd = open("/proc/cmdline", O_RDONLY);
+	if (fd < 0)
+		return false;
+
+	rc = read(fd, buf, sizeof(buf));
+	close(fd);
+
+	if (rc <= 0)
+		return false;
+
+	return memmem(buf, rc, kernel_cmdline_debug,
+			strlen(kernel_cmdline_debug)) != NULL;
 }
 
 void config_set_defaults(struct config *config)
 {
 	config->autoboot_enabled = true;
 	config->autoboot_timeout_sec = 10;
+	config->autoboot_enabled = true;
 	config->network.interfaces = NULL;
 	config->network.n_interfaces = 0;
 	config->network.dns_servers = NULL;
 	config->network.n_dns_servers = 0;
+	config->boot_device = NULL;
+	config->safe_mode = false;
+	config->lang = NULL;
 
 	config->n_boot_priorities = 2;
 	config->boot_priorities = talloc_array(config, struct boot_priority,
@@ -70,6 +133,8 @@ void config_set_defaults(struct config *config)
 	config->boot_priorities[0].priority = 2;
 	config->boot_priorities[1].type = DEVICE_TYPE_DISK;
 	config->boot_priorities[1].priority = 1;
+
+	config->debug = config_debug_on_cmdline();
 }
 
 int platform_init(void *ctx)
@@ -108,6 +173,19 @@ const struct platform *platform_get(void)
 	return platform;
 }
 
+void platform_finalise_config(void)
+{
+	if (platform && platform->finalise_config)
+		platform->finalise_config(platform);
+}
+
+int platform_get_sysinfo(struct system_info *info)
+{
+	if (platform && platform->get_sysinfo)
+		return platform->get_sysinfo(platform, info);
+	return -1;
+}
+
 int config_set(struct config *newconfig)
 {
 	int rc;