From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 2 Jul 2013 03:24:10 +0000 (+0800)
Subject: discover/device-handler: hook up autoboot_enabled config var
X-Git-Tag: v1.0.0~557
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=d2d7d2911c4d97edd31f6596365e6c5249768a99

discover/device-handler: hook up autoboot_enabled config var

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/discover/device-handler.c b/discover/device-handler.c
index d2a3f16..a6dbf63 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
+#include <pb-config/pb-config.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
@@ -292,7 +293,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
 	handler->waitset = waitset;
 	handler->dry_run = dry_run;
 	handler->default_boot_option = NULL;
-	handler->default_enabled = true;
+	handler->default_enabled = config_get()->autoboot_enabled;
 	list_init(&handler->unresolved_boot_options);
 
 	/* set up our mount point base */