#include "pb-config.h"
-#include "storage.h"
-
-void *config_ctx;
-static struct config *config;
-static struct config_storage *storage;
-
-
-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;
- config->network.dns_servers = NULL;
- config->network.n_dns_servers = 0;
-
- 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[1].type = DEVICE_TYPE_DISK;
-
-}
-
static struct interface_config *config_copy_interface(struct config *ctx,
struct interface_config *src)
{
- struct interface_config *dest = talloc(ctx, struct interface_config);
+ struct interface_config *dest = talloc_zero(ctx,
+ struct interface_config);
memcpy(dest->hwaddr, src->hwaddr, sizeof(src->hwaddr));
dest->ignore = src->ignore;
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;
}
struct config *dest;
unsigned int i;
- dest = talloc(ctx, struct config);
+ 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.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].type = src->boot_priorities[i].type;
-
- return dest;
-}
-
-void dump_config(struct config *config);
-void dump_config(struct config *config)
-{
- unsigned int i;
-
- pb_log("configuration:\n");
-
- if (config->autoboot_enabled)
- pb_log(" autoboot: enabled, %d sec\n",
- config->autoboot_timeout_sec);
- else
- pb_log(" autoboot: disabled\n");
-
- if (config->network.n_interfaces || config->network.n_dns_servers)
- pb_log(" network configuration:\n");
-
- 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);
-
- }
+ 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);
}
- 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_ctx = talloc_new(ctx);
-
- config = talloc(config_ctx, struct config);
- config_set_defaults(config);
-
- storage = create_powerpc_nvram_storage(config);
-
- storage->load(storage, config);
-
- dump_config(config);
-
- return 0;
-}
-
-int config_set(struct config *newconfig)
-{
- int rc;
+ dest->ipmi_bootdev = src->ipmi_bootdev;
+ dest->ipmi_bootdev_persistent = src->ipmi_bootdev_persistent;
- if (!storage || !storage->save)
- return -1;
+ dest->allow_writes = src->allow_writes;
- if (newconfig == config)
- return 0;
+ dest->n_tty = src->n_tty;
+ if (src->tty_list)
+ dest->tty_list = talloc_array(dest, char *, src->n_tty);
+ for (i = 0; i < src->n_tty && src->n_tty; i++)
+ dest->tty_list[i] = talloc_strdup(dest->tty_list,
+ src->tty_list[i]);
- pb_log("new configuration data received\n");
- dump_config(newconfig);
+ if (src->boot_tty)
+ dest->boot_tty = talloc_strdup(dest, src->boot_tty);
- rc = storage->save(storage, newconfig);
-
- if (!rc)
- config = talloc_steal(config_ctx, newconfig);
+ if (src->lang && strlen(src->lang))
+ dest->lang = talloc_strdup(dest, src->lang);
else
- pb_log("error saving new configuration; changes lost\n");
-
- return rc;
-}
+ dest->lang = NULL;
-/* A non-exported function to allow the test infrastructure to initialise
- * (and change) the configuration variables */
-struct parser_test;
-struct config __attribute__((unused)) *test_config_init(
- struct parser_test *test);
-struct config *test_config_init(struct parser_test *test)
-{
- config = talloc(test, struct config);
- config_set_defaults(config);
- return config;
-}
-
-const struct config *config_get(void)
-{
- return config;
-}
-
-void config_set_autoboot(bool autoboot_enabled)
-{
- config->autoboot_enabled = autoboot_enabled;
-
- pb_log("set autoboot: %s\n",
- config->autoboot_enabled ? "enabled" : "disabled");
-}
-
-int config_fini(void)
-{
- talloc_free(config_ctx);
- return 0;
+ return dest;
}
projects / petitboot / blobdiff