summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2013-07-22 14:38:52 -0700
committerGeoff Levand <geoff@infradead.org>2013-07-23 10:40:44 -0700
commit4466139b7bf4573b6b85555bb1ff7e31fbaaa934 (patch)
treec1b0e429ca957558ef1c2c6cef67072626dae79e
parenta0cc5293d585c1857d4ed3a2421ddfa79ecbf4d2 (diff)
downloadtalos-petitboot-4466139b7bf4573b6b85555bb1ff7e31fbaaa934.tar.gz
talos-petitboot-4466139b7bf4573b6b85555bb1ff7e31fbaaa934.zip
discover: Rename default_enabled
Rename default_enabled to autoboot_enabled for consistency with pb-config. Signed-off-by: Geoff Levand <geoff@infradead.org>
-rw-r--r--discover/device-handler.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c
index a6dbf63..ee99f21 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -33,7 +33,7 @@ struct device_handler {
struct waitset *waitset;
struct waiter *timeout_waiter;
- bool default_enabled;
+ bool autoboot_enabled;
unsigned int sec_to_boot;
struct discover_boot_option *default_boot_option;
@@ -293,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 = config_get()->autoboot_enabled;
+ handler->autoboot_enabled = config_get()->autoboot_enabled;
list_init(&handler->unresolved_boot_options);
/* set up our mount point base */
@@ -439,7 +439,7 @@ static void set_default(struct device_handler *handler,
if (handler->default_boot_option)
return;
- if (!handler->default_enabled)
+ if (!handler->autoboot_enabled)
return;
pb_log("Boot option %s set as default\n", opt->option->id);
@@ -824,7 +824,7 @@ void device_handler_cancel_default(struct device_handler *handler)
waiter_remove(handler->timeout_waiter);
handler->timeout_waiter = NULL;
- handler->default_enabled = false;
+ handler->autoboot_enabled = false;
/* we only send status if we had a default boot option queued */
if (!handler->default_boot_option)
OpenPOWER on IntegriCloud