discover/network: fix incorrect nameserver directive in resolv.conf

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index a6dbf63e88a07635575e93c24473d3fd24eed9c5..d14e54fd2ec99b5ee46cfa87bf0bc4582c6e6d64 100644 (file)
--- 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 */
@@ -400,7 +400,7 @@ static void countdown_status(struct device_handler *handler,
        status.progress = -1;
        status.detail = NULL;
        status.message = talloc_asprintf(handler,
-                       "Booting %s in %d sec", opt->option->name, sec);
+                       "Booting %s in %u sec", opt->option->name, sec);
 
        discover_server_notify_boot_status(handler->server, &status);
 
@@ -439,13 +439,15 @@ 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);
-
        handler->default_boot_option = opt;
        handler->sec_to_boot = DEFAULT_BOOT_TIMEOUT_SEC;
+
+       pb_log("Boot option %s set as default, timeout %u sec.\n",
+              opt->option->id, handler->sec_to_boot);
+
        default_timeout(handler);
 }
 
@@ -824,7 +826,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)