discover: Remove unnecessary event passing

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

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index 5cd303b06d257e6292fc49a87f918ba24308db78..aad3b9e5a44cf3f7838fe252e36a2b614a1d007f 100644 (file)
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -13,8 +13,11 @@ 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;
+       config->network.dns_servers = NULL;
+       config->network.n_dns_servers = 0;
 }
 
 static void dump_config(struct config *config)
@@ -23,10 +26,13 @@ static void dump_config(struct config *config)
 
        pb_log("configuration:\n");
 
-       pb_log(" autoboot: %s\n",
-                       config->autoboot_enabled ? "enabled" : "disabled");
+       if (config->autoboot_enabled)
+               pb_log(" autoboot: enabled, %d sec\n",
+                               config->autoboot_timeout_sec);
+       else
+               pb_log(" autoboot: disabled\n");
 
-       if (config->n_network_configs > 0)
+       if (config->network.n_interfaces || config->network.n_dns_servers)
                pb_log(" network configuration:\n");
 
        for (i = 0; i < config->network.n_interfaces; i++) {
@@ -53,6 +59,8 @@ static void dump_config(struct config *config)
 
                }
        }
+       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)
@@ -69,6 +77,18 @@ int config_init(void *ctx)
        return 0;
 }
 
+/* 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;