discover: Make boot_priorities more flexible

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

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 53ed6d6e2b31ebab2df2abaf13e11bb7401f9909..ed84fec9e76d8dc4fc21859eebdeed8fa9cd3f8f 100644 (file)
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -1,95 +1,72 @@
 
+#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)
-{
-       config->autoboot_enabled = true;
-       config->autoboot_timeout_sec = 10;
-       config->network.interfaces = NULL;
-       config->network.n_interfaces = 0;
-}
-
-static void dump_config(struct config *config)
+static struct interface_config *config_copy_interface(struct config *ctx,
+               struct interface_config *src)
 {
-       int i;
+       struct interface_config *dest = talloc(ctx, struct interface_config);
 
-       pb_log("configuration:\n");
+       memcpy(dest->hwaddr, src->hwaddr, sizeof(src->hwaddr));
+       dest->ignore = src->ignore;
 
-       if (config->autoboot_enabled)
-               pb_log(" autoboot: enabled, %d sec\n",
-                               config->autoboot_timeout_sec);
-       else
-               pb_log(" autoboot: disabled\n");
+       if (dest->ignore)
+               return dest;
 
-       if (config->network.n_interfaces || config->network.n_dns_servers)
-               pb_log(" network configuration:\n");
+       dest->method = src->method;
 
-       for (i = 0; i < config->network.n_interfaces; i++) {
-               struct interface_config *ifconf =
-                       config->network.interfaces[i];
-
-               pb_log("  interface %02x:%02x:%02x:%02x:%02x:%02x\n",
-                               ifconf->hwaddr[0], ifconf->hwaddr[1],
-                               ifconf->hwaddr[2], ifconf->hwaddr[3],
-                               ifconf->hwaddr[4], ifconf->hwaddr[5]);
-
-               if (ifconf->ignore) {
-                       pb_log("   ignore\n");
-                       continue;
-               }
-
-               if (ifconf->method == CONFIG_METHOD_DHCP) {
-                       pb_log("   dhcp\n");
-
-               } else if (ifconf->method == CONFIG_METHOD_STATIC) {
-                       pb_log("   static:\n");
-                       pb_log("    ip:  %s\n", ifconf->static_config.address);
-                       pb_log("    gw:  %s\n", ifconf->static_config.gateway);
-
-               }
+       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);
+               break;
        }
-       for (i = 0; i < config->network.n_dns_servers; i++)
-               pb_log("  dns server %s\n", config->network.dns_servers[i]);
-}
 
-int config_init(void *ctx)
-{
-       config = talloc(ctx, struct config);
-       config_set_defaults(config);
-
-       storage = create_powerpc_nvram_storage(config);
-
-       storage->load(storage, config);
-
-       dump_config(config);
-
-       return 0;
-}
-
-const struct config *config_get(void)
-{
-       return config;
+       return dest;
 }
 
-void config_set_autoboot(bool autoboot_enabled)
+struct config *config_copy(void *ctx, const struct config *src)
 {
-       config->autoboot_enabled = autoboot_enabled;
-
-       pb_log("set autoboot: %s\n",
-                       config->autoboot_enabled ? "enabled" : "disabled");
-}
+       struct config *dest;
+       unsigned int i;
+
+       dest = talloc(ctx, struct config);
+       dest->autoboot_enabled = src->autoboot_enabled;
+       dest->autoboot_timeout_sec = src->autoboot_timeout_sec;
+
+       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_boot_priorities = src->n_boot_priorities;
+       dest->boot_priorities = talloc_array(dest, struct boot_priority,
+                       src->n_boot_priorities);
+
+       for (i = 0; i < src->n_boot_priorities; i++) {
+               dest->boot_priorities[i].priority =
+                                       src->boot_priorities[i].priority;
+               dest->boot_priorities[i].type = src->boot_priorities[i].type;
+       }
 
-int config_fini(void)
-{
-       talloc_free(config);
-       return 0;
+       return dest;
 }