Consolidate petitboot,tty and petitboot,console

[petitboot] / lib / pb-config / pb-config.c

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 9f7d240999018c1b7f09a0bbe653c997e5ee735c..2f9af286b770aec0e5083a1a92296fd642e27fe3 100644 (file)
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -1,81 +1,103 @@
 
+#include <string.h>
+
 #include <log/log.h>
+#include <types/types.h>
 #include <talloc/talloc.h>
 
 #include "pb-config.h"
 
-#include "storage.h"
-
-static struct config           *config;
-static struct config_storage   *storage;
-
-
-static void config_set_defaults(struct config *config)
+static struct interface_config *config_copy_interface(struct config *ctx,
+               struct interface_config *src)
 {
-       config->autoboot_enabled = true;
-       config->network_configs = NULL;
-       config->n_network_configs = 0;
-}
-
-static void dump_config(struct config *config)
-{
-       int i;
-
-       pb_log("configuration:\n");
-
-       pb_log(" autoboot enabled: %s\n",
-                       config->autoboot_enabled ? "yes" : "no");
-
-       if (config->n_network_configs > 0)
-               pb_log(" network configuration:\n");
-
-       for (i = 0; i < config->n_network_configs; i++) {
-               struct network_config *netconf = config->network_configs[i];
-
-               pb_log("  interface %02x:%02x:%02x:%02x:%02x:%02x\n",
-                               netconf->hwaddr[0], netconf->hwaddr[1],
-                               netconf->hwaddr[2], netconf->hwaddr[3],
-                               netconf->hwaddr[4], netconf->hwaddr[5]);
-
-               if (netconf->ignore) {
-                       pb_log("   ignore\n");
-                       continue;
-               }
-
-               if (netconf->method == CONFIG_METHOD_DHCP) {
-                       pb_log("   dhcp\n");
-
-               } else if (netconf->method == CONFIG_METHOD_STATIC) {
-                       pb_log("   static:\n");
-                       pb_log("    ip:  %s\n", netconf->static_config.address);
-                       pb_log("    gw:  %s\n", netconf->static_config.gateway);
-                       pb_log("    dns: %s\n", netconf->static_config.dns);
-
-               }
+       struct interface_config *dest = talloc_zero(ctx,
+                                               struct interface_config);
+
+       memcpy(dest->hwaddr, src->hwaddr, sizeof(src->hwaddr));
+       dest->ignore = src->ignore;
+
+       if (dest->ignore)
+               return dest;
+
+       dest->method = src->method;
+
+       switch (src->method) {
+       case CONFIG_METHOD_DHCP:
+               break;
+       case CONFIG_METHOD_STATIC:
+               dest->static_config.address =
+                       talloc_strdup(dest, src->static_config.address);
+               dest->static_config.gateway =
+                       talloc_strdup(dest, src->static_config.gateway);
+               dest->static_config.url =
+                       talloc_strdup(dest, src->static_config.url);
+               break;
        }
+       dest->override = src->override;
+
+       return dest;
 }
 
-int config_init(void *ctx)
+struct config *config_copy(void *ctx, const struct config *src)
 {
-       config = talloc(ctx, struct config);
-       config_set_defaults(config);
+       struct config *dest;
+       unsigned int i;
+
+       dest = talloc_zero(ctx, struct config);
+       dest->autoboot_enabled = src->autoboot_enabled;
+       dest->autoboot_timeout_sec = src->autoboot_timeout_sec;
+       dest->safe_mode = src->safe_mode;
+
+       dest->network.n_interfaces = src->network.n_interfaces;
+       dest->network.interfaces = talloc_array(dest, struct interface_config *,
+                                       dest->network.n_interfaces);
+       dest->network.n_dns_servers = src->network.n_dns_servers;
+       dest->network.dns_servers = talloc_array(dest, const char *,
+                                       dest->network.n_dns_servers);
+
+       for (i = 0; i < src->network.n_interfaces; i++)
+               dest->network.interfaces[i] = config_copy_interface(dest,
+                               src->network.interfaces[i]);
+
+       for (i = 0; i < src->network.n_dns_servers; i++)
+               dest->network.dns_servers[i] = talloc_strdup(dest,
+                               src->network.dns_servers[i]);
+
+       dest->n_autoboot_opts = src->n_autoboot_opts;
+       dest->autoboot_opts = talloc_array(dest, struct autoboot_option,
+                                       dest->n_autoboot_opts);
+
+       for (i = 0; i < src->n_autoboot_opts; i++) {
+               dest->autoboot_opts[i].boot_type =
+                       src->autoboot_opts[i].boot_type;
+               if (src->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+                       dest->autoboot_opts[i].type =
+                               src->autoboot_opts[i].type;
+               else
+                       dest->autoboot_opts[i].uuid =
+                               talloc_strdup(dest, src->autoboot_opts[i].uuid);
+       }
 
-       storage = create_powerpc_nvram_storage(config);
+       dest->ipmi_bootdev = src->ipmi_bootdev;
+       dest->ipmi_bootdev_persistent = src->ipmi_bootdev_persistent;
 
-       storage->load(storage, config);
+       dest->allow_writes = src->allow_writes;
 
-       dump_config(config);
+       dest->n_consoles = src->n_consoles;
+       if (src->consoles)
+               dest->consoles = talloc_array(dest, char *, src->n_consoles);
+       for (i = 0; i < src->n_consoles && src->n_consoles; i++)
+               dest->consoles[i] = talloc_strdup(dest->consoles,
+                                               src->consoles[i]);
 
-       return 0;
-}
+       if (src->boot_console)
+               dest->boot_console = talloc_strdup(dest, src->boot_console);
+       dest->manual_console = src->manual_console;
 
-const struct config *config_get(void)
-{
-       return config;
-}
+       if (src->lang && strlen(src->lang))
+               dest->lang = talloc_strdup(dest, src->lang);
+       else
+               dest->lang = NULL;
 
-int config_fini(void)
-{
-       talloc_free(config);
-       return 0;
+       return dest;
 }