lib: Define autoboot_options, device_type helpers

[petitboot] / discover / platform.c

diff --git a/discover/platform.c b/discover/platform.c
index 0a221e295bb87a67992a6ccede556fe3e49271c2..445158991fcef7cfc2b2846b0154d7bb45f97625 100644 (file)
--- a/discover/platform.c
+++ b/discover/platform.c
@@ -17,23 +17,6 @@ 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;
@@ -91,6 +74,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 +117,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 +163,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)