#include <url/url.h>
#include <i18n/i18n.h>
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
handler->server = server;
handler->waitset = waitset;
handler->dry_run = dry_run;
- handler->autoboot_enabled = config_get()->autoboot_enabled;
+ handler->autoboot_enabled = config_autoboot_active(config_get());
list_init(&handler->unresolved_boot_options);
unsigned int i;
device_handler_cancel_default(handler);
+ /* Cancel any pending non-default boot */
+ if (handler->pending_boot) {
+ boot_cancel(handler->pending_boot);
+ handler->pending_boot = NULL;
+ handler->pending_boot_is_default = false;
+ }
+
+ /* Cancel any remaining async jobs */
+ process_stop_async_all();
/* free unresolved boot options */
list_for_each_entry_safe(&handler->unresolved_boot_options,
_("Processing new %s device"),
device_type_display_name(dev->device->type));
- process_boot_option_queue(handler);
-
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
/* add discovered stuff to the handler */
device_handler_discover_context_commit(handler, ctx);
+ process_boot_option_queue(handler);
out:
talloc_unlink(handler, ctx);