X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-config%2Fpb-config.c;h=b6f26c70fe16c3e3cd174d7392532d85ce43dc50;hp=e43ddf885bfdee497df6757cf0e6f56b71ffb584;hb=c12cebabba5c4647f558ef40f8cbc8c6a204593e;hpb=c109a4d1bfbe3016c1380c7b0a836a319aa0cf23

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index e43ddf8..b6f26c7 100644
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -1,5 +1,6 @@
 
 #include <log/log.h>
+#include <types/types.h>
 #include <talloc/talloc.h>
 
 #include "pb-config.h"
@@ -18,6 +19,13 @@ static void config_set_defaults(struct config *config)
 	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 void dump_config(struct config *config)
@@ -77,6 +85,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;