X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fplatform.c;h=04798ac8a4912e12e1f81a601f4eaaae8b1012c5;hb=a2bf5c1d47998a13351ccb6c35e3cf8f6e79909b;hp=0a221e295bb87a67992a6ccede556fe3e49271c2;hpb=4d5a57a73cbfa29ad2c8672f157294f733726f90;p=petitboot diff --git a/discover/platform.c b/discover/platform.c index 0a221e2..04798ac 100644 --- a/discover/platform.c +++ b/discover/platform.c @@ -91,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 ?: ""); } @@ -130,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(); } @@ -173,10 +180,12 @@ const struct platform *platform_get(void) return platform; } -void platform_finalise_config(void) +void platform_pre_boot(void) { - if (platform && platform->finalise_config) - platform->finalise_config(platform); + 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)