diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2014-01-29 13:28:06 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2014-01-30 21:59:10 +0800 |
commit | c14b12980885edd035322cd3bc87efff444c39b1 (patch) | |
tree | 138bac8bfacd9d1a36d04421d91e0eedf4164da2 /lib/pb-config/pb-config.c | |
parent | dea7842fb28ff055b4e0f43a6a1fdaf3c4b5ba89 (diff) | |
download | talos-petitboot-c14b12980885edd035322cd3bc87efff444c39b1.tar.gz talos-petitboot-c14b12980885edd035322cd3bc87efff444c39b1.zip |
pb-config: Move config storage modules to "platform" modules in discover code
There's no need to include the config storage code in lib/ as only the
discover server should be using it.
This change moves the config-storage code to discover/, with the
platform-specific parts moved to a 'struct platform'. Each platform has
a probe function, which is called during init. The first probe function
to return a platform is used.
At present we only have the one platform, but it's now non-intrusive to
add others.
We keep an array of platform pointers in a separate ("platforms")
section, to allow the test module to drop-in its own test "platform".
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'lib/pb-config/pb-config.c')
-rw-r--r-- | lib/pb-config/pb-config.c | 138 |
1 files changed, 0 insertions, 138 deletions
diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c index 9f696d5..35008cc 100644 --- a/lib/pb-config/pb-config.c +++ b/lib/pb-config/pb-config.c @@ -7,30 +7,6 @@ #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) { @@ -91,117 +67,3 @@ struct config *config_copy(void *ctx, const struct config *src) 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); - - } - } - 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; - - if (!storage || !storage->save) - return -1; - - if (newconfig == config) - return 0; - - pb_log("new configuration data received\n"); - dump_config(newconfig); - - rc = storage->save(storage, newconfig); - - if (!rc) - config = talloc_steal(config_ctx, newconfig); - else - pb_log("error saving new configuration; changes lost\n"); - - return rc; -} - -/* 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; -} |