for (i = 0; i < config->n_boot_priorities; i++) {
prio = &config->boot_priorities[i];
if (priority_match(prio, opt))
- break;
+ return prio->priority;
}
- return i;
+ return 0;
}
static void set_default(struct device_handler *handler,
struct discover_boot_option *opt)
{
+ int new_prio;
+
if (!handler->autoboot_enabled)
return;
+ new_prio = default_option_priority(opt);
+
+ /* A negative priority indicates that we don't want to boot this device
+ * by default */
+ if (new_prio < 0)
+ return;
+
/* Resolve any conflicts: if we have a new default option, it only
* replaces the current if it has a higher priority. */
if (handler->default_boot_option) {
- int new_prio, cur_prio;
+ int cur_prio;
- new_prio = default_option_priority(opt);
cur_prio = default_option_priority(
handler->default_boot_option);
- if (new_prio < cur_prio) {
+ if (new_prio > cur_prio) {
handler->default_boot_option = opt;
/* extend the timeout a little, so the user sees some
* indication of the change */
config->boot_priorities = talloc_array(config, struct boot_priority,
config->n_boot_priorities);
config->boot_priorities[0].type = DEVICE_TYPE_NETWORK;
+ config->boot_priorities[0].priority = 2;
config->boot_priorities[1].type = DEVICE_TYPE_DISK;
-
+ config->boot_priorities[1].priority = 1;
}
int platform_init(void *ctx)
dest->boot_priorities = talloc_array(dest, struct boot_priority,
src->n_boot_priorities);
- for (i = 0; i < src->n_boot_priorities; i++)
+ for (i = 0; i < src->n_boot_priorities; i++) {
+ dest->boot_priorities[i].priority =
+ src->boot_priorities[i].priority;
dest->boot_priorities[i].type = src->boot_priorities[i].type;
+ }
return dest;
}
len += 4 + optional_strlen(config->network.dns_servers[i]);
len += 4;
- len += config->n_boot_priorities * 4;
+ len += config->n_boot_priorities * 8;
return len;
}
*(uint32_t *)pos = __cpu_to_be32(config->n_boot_priorities);
pos += 4;
for (i = 0; i < config->n_boot_priorities; i++) {
- *(uint32_t *)pos = __cpu_to_be32(config->boot_priorities[i].type);
+ *(uint32_t *)pos =
+ __cpu_to_be32(config->boot_priorities[i].type);
+ pos += 4;
+ *(uint32_t *)pos =
+ __cpu_to_be32(config->boot_priorities[i].priority);
pos += 4;
}
};
struct boot_priority {
+ /* Boot options with higher priority values will take precedence over
+ * lower values. Negative priorities signify "don't boot this by
+ * default".
+ */
+ int priority;
enum device_type type;
};