X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=a6eb8843d514e0a99f9a53bb79ea951e8ec6f36a;hp=8ad885f68225c031efc6de9b0b9f570776a53662;hb=7e0b9da2ae2f96d24c711c0ad4d12bb193ec49c0;hpb=c62ae29ecbc248527a03578fa18e1b6b93506965

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 8ad885f..a6eb884 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,4 +1,5 @@
 #include <assert.h>
+#include <inttypes.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>
@@ -653,7 +654,7 @@ void device_handler_status_download(struct device_handler *handler,
 			unit++;
 		}
 		update = talloc_asprintf(handler,
-				_("%u %s downloading: %.0f%% - %lu%cB"),
+				_("%u %s downloading: %.0f%% - %" PRIu64 "%cB"),
 				handler->n_progress,
 				ngettext("item", "items", handler->n_progress),
 				(current / total) * 100, current_converted,
@@ -831,6 +832,9 @@ static enum default_priority default_option_priority(
 		int boot_match = autoboot_option_priority(config, opt);
 		if (boot_match > 0)
 			return boot_match;
+	} else {
+		/* If there is no specific boot order, boot any device */
+		return DEFAULT_PRIORITY_LOCAL_FIRST;
 	}
 
 	/* If the option didn't match any entry in the array, it is disabled */
@@ -1356,7 +1360,7 @@ static void process_url_cb(struct load_url_result *result, void *data)
 
 	mac = event_get_param(event, "mac");
 	char *url = talloc_asprintf(event, "file://%s", result->local);
-	event_set_param(event, "pxeconffile", url);
+	event_set_param(event, "pxeconffile-local", url);
 
 	dev = discover_device_create(handler, mac, event->device);
 	ctx = device_handler_discover_context_create(handler, dev);