discover/device-handler: Include makedev() from sysmacros.h

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 78fb159a3026a2d515d05d0467eae27bd4e33938..ec1eee344802a24e3c9f4febdd69d1c6f6fdc6c4 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -19,6 +19,7 @@
 #include <url/url.h>
 #include <i18n/i18n.h>
 
+#include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -321,7 +322,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
        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);
 
@@ -358,6 +359,9 @@ void device_handler_reinit(struct device_handler *handler)
                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,
                        opt, tmp, list)