X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=569e65290bd7e98cef518b078a16f76547ecb564;hp=7a570f9e612da52ff7d098ee2e7ec8ac6eb3bb23;hb=917f7aa880a7c6ab08991ae0c969d0489ba48845;hpb=41caf09e98b14e34830f524405efc1bdd4087365

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 7a570f9..569e652 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -832,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 */
@@ -1557,8 +1560,7 @@ void device_handler_add_plugin_option(struct device_handler *handler,
 		tmp = handler->plugins[i];
 		/* If both id and version match, ignore */
 		if (strncmp(opt->id, tmp->id, strlen(opt->id)) == 0 &&
-				strncmp(opt->version, tmp->version,
-					strlen(opt->version) == 0)) {
+				strcmp(opt->version, tmp->version) == 0) {
 			pb_log("discover: Plugin '%s' already exists, ignoring\n",
 					opt->id);
 			return;