discover: Use device_handler_status_dev_* for device-specific status

[petitboot] / discover / platform.c

diff --git a/discover/platform.c b/discover/platform.c
index 0a221e295bb87a67992a6ccede556fe3e49271c2..cc6306f035b96e622fb40026b780925279ac78fa 100644 (file)
--- a/discover/platform.c
+++ b/discover/platform.c
@@ -3,6 +3,7 @@
 
 #include <fcntl.h>
 #include <string.h>
+#include <locale.h>
 
 #include <log/log.h>
 #include <file/file.h>
@@ -17,23 +18,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;
@@ -52,6 +36,9 @@ static void dump_config(struct config *config)
        if (config->safe_mode)
                pb_log(" safe mode: active\n");
 
+       if (config->disable_snapshots)
+               pb_log(" dm-snapshots disabled\n");
+
        for (i = 0; i < config->network.n_interfaces; i++) {
                struct interface_config *ifconf =
                        config->network.interfaces[i];
@@ -73,23 +60,38 @@ static void dump_config(struct config *config)
                        pb_log("   static:\n");
                        pb_log("    ip:  %s\n", ifconf->static_config.address);
                        pb_log("    gw:  %s\n", ifconf->static_config.gateway);
+                       pb_log("    url:  %s\n", ifconf->static_config.url);
 
                }
        }
        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);
+       for (i = 0; i < config->n_autoboot_opts; i++) {
+               if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+                       pb_log("  boot device %d: %s\n", i,
+                              device_type_name(config->autoboot_opts[i].type));
+               else
+                       pb_log("  boot device %d: uuid: %s\n",
+                              i, config->autoboot_opts[i].uuid);
+       }
 
-       if (config->n_boot_priorities)
-               pb_log(" boot priority order:\n");
+       pb_log("  IPMI boot device 0x%02x%s\n", config->ipmi_bootdev,
+                       config->ipmi_bootdev_persistent ? " (persistent)" : "");
+
+       pb_log("  Modifications allowed to disks: %s\n",
+                       config->allow_writes ? "yes" : "no");
+
+       pb_log("  Default UI to boot on: %s\n",
+               config->boot_console ?: "none set");
+       if (config->manual_console)
+               pb_log("    (Manually set)\n");
+
+       if (config->http_proxy)
+               pb_log("  HTTP Proxy: %s\n", config->http_proxy);
+       if (config->https_proxy)
+               pb_log("  HTTPS Proxy: %s\n", config->https_proxy);
 
-       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 ?: "");
 }
@@ -115,6 +117,8 @@ static bool config_debug_on_cmdline(void)
 
 void config_set_defaults(struct config *config)
 {
+       const char *lang;
+
        config->autoboot_enabled = true;
        config->autoboot_timeout_sec = 10;
        config->autoboot_enabled = true;
@@ -122,19 +126,36 @@ void config_set_defaults(struct config *config)
        config->network.n_interfaces = 0;
        config->network.dns_servers = NULL;
        config->network.n_dns_servers = 0;
-       config->boot_device = NULL;
+       config->http_proxy = NULL;
+       config->https_proxy = NULL;
        config->safe_mode = false;
-       config->lang = NULL;
+       config->allow_writes = true;
+       config->disable_snapshots = false;
+
+       config->n_consoles = 0;
+       config->consoles = NULL;
+       config->boot_console = NULL;
+
+       config->n_autoboot_opts = 2;
+       config->autoboot_opts = talloc_array(config, struct autoboot_option,
+                                               config->n_autoboot_opts);
+       config->autoboot_opts[0].boot_type = BOOT_DEVICE_TYPE;
+       config->autoboot_opts[0].type = DEVICE_TYPE_NETWORK;
+       config->autoboot_opts[1].boot_type = BOOT_DEVICE_TYPE;
+       config->autoboot_opts[1].type = DEVICE_TYPE_ANY;
 
-       config->n_boot_priorities = 2;
-       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[1].priority = 1;
+       config->ipmi_bootdev = 0;
+       config->ipmi_bootdev_persistent = false;
 
        config->debug = config_debug_on_cmdline();
+
+       lang = setlocale(LC_ALL, NULL);
+       pb_log("lang: %s\n", lang);
+       if (lang && strlen(lang))
+               config->lang = talloc_strdup(config, lang);
+       else
+               config->lang = NULL;
+
 }
 
 int platform_init(void *ctx)
@@ -173,10 +194,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)