X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fplatform.c;h=04798ac8a4912e12e1f81a601f4eaaae8b1012c5;hb=900412ec49f30fbb7872a5ff38538a19c17e20a2;hp=418b9ea1d68f0cdae48ded8a086680d061645199;hpb=71da0c6cb80e3708213a08c06e71f099534bcd2a;p=petitboot

diff --git a/discover/platform.c b/discover/platform.c
index 418b9ea..04798ac 100644
--- a/discover/platform.c
+++ b/discover/platform.c
@@ -79,6 +79,9 @@ 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");
 
@@ -88,6 +91,10 @@ static void dump_config(struct config *config)
 					prio->priority);
 	}
 
+	pb_log("  IPMI boot device 0x%02x%s\n", config->ipmi_bootdev,
+			config->ipmi_bootdev_persistent ? " (persistent)" : "");
+
+
 	pb_log(" language: %s\n", config->lang ?: "");
 }
 
@@ -127,10 +134,13 @@ void config_set_defaults(struct config *config)
 	config->boot_priorities = talloc_array(config, struct boot_priority,
 						config->n_boot_priorities);
 	config->boot_priorities[0].type = DEVICE_TYPE_NETWORK;
-	config->boot_priorities[0].priority = 2;
-	config->boot_priorities[1].type = DEVICE_TYPE_DISK;
+	config->boot_priorities[0].priority = 0;
+	config->boot_priorities[1].type = DEVICE_TYPE_ANY;
 	config->boot_priorities[1].priority = 1;
 
+	config->ipmi_bootdev = 0;
+	config->ipmi_bootdev_persistent = false;
+
 	config->debug = config_debug_on_cmdline();
 }
 
@@ -170,6 +180,14 @@ const struct platform *platform_get(void)
 	return platform;
 }
 
+void platform_pre_boot(void)
+{
+	const struct config *config = config_get();
+
+	if (platform && config && platform->pre_boot)
+		platform->pre_boot(platform, config);
+}
+
 int platform_get_sysinfo(struct system_info *info)
 {
 	if (platform && platform->get_sysinfo)