petitboot: Implement ordered boot options

Move petitboot to a more familiar 'boot-order' based autoboot system.
The discover server now reads multiple values from the petitboot,bootdev
parameter and adds them in order to config->autoboot_opts. Boot priority
is determined by the options' position in the list.
On the client, nc-config now recognises the new boot order, and allows
the user to add, remove, and reorder the devices in the list.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>

3 files changed, 47 insertions, 49 deletions

diff --git a/lib/pb-config/pb-config.c b/lib/pb-config/pb-config.c
index a2272f4..98a6078 100644
--- a/lib/pb-config/pb-config.c
+++ b/lib/pb-config/pb-config.c
@@ -59,21 +59,21 @@ struct config *config_copy(void *ctx, const struct config *src)
 		dest->network.dns_servers[i] = talloc_strdup(dest,
 				src->network.dns_servers[i]);
 
-	dest->n_boot_priorities = src->n_boot_priorities;
-	dest->boot_priorities = talloc_array(dest, struct boot_priority,
-			src->n_boot_priorities);
-
-	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;
+	dest->n_autoboot_opts = src->n_autoboot_opts;
+	dest->autoboot_opts = talloc_array(dest, struct autoboot_option,
+					dest->n_autoboot_opts);
+
+	for (i = 0; i < src->n_autoboot_opts; i++) {
+		dest->autoboot_opts[i].boot_type =
+			src->autoboot_opts[i].boot_type;
+		if (src->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+			dest->autoboot_opts[i].type =
+				src->autoboot_opts[i].type;
+		else
+			dest->autoboot_opts[i].uuid =
+				talloc_strdup(dest, src->autoboot_opts[i].uuid);
 	}
 
-	if (src->boot_device && strlen(src->boot_device))
-		dest->boot_device = talloc_strdup(dest, src->boot_device);
-	else
-		dest->boot_device = NULL;
-
 	dest->ipmi_bootdev = src->ipmi_bootdev;
 	dest->ipmi_bootdev_persistent = src->ipmi_bootdev_persistent;
 
diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 4398248..69ea35d 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -280,9 +280,13 @@ int pb_protocol_config_len(const struct config *config)
 		len += 4 + optional_strlen(config->network.dns_servers[i]);
 
 	len += 4;
-	len += config->n_boot_priorities * 8;
-
-	len += 4 + optional_strlen(config->boot_device);
+	for (i = 0; i < config->n_autoboot_opts; i++) {
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE)
+			len += 4 + 4;
+		else
+			len += 4 + 4 +
+				optional_strlen(config->autoboot_opts[i].uuid);
+	}
 
 	len += 4 + 4; /* ipmi_bootdev, ipmi_bootdev_persistent */
 
@@ -477,19 +481,22 @@ int pb_protocol_serialise_config(const struct config *config,
 				config->network.dns_servers[i]);
 	}
 
-	*(uint32_t *)pos = __cpu_to_be32(config->n_boot_priorities);
+	*(uint32_t *)pos = __cpu_to_be32(config->n_autoboot_opts);
 	pos += 4;
-	for (i = 0; i < config->n_boot_priorities; i++) {
-		*(uint32_t *)pos =
-			__cpu_to_be32(config->boot_priorities[i].type);
-		pos += 4;
+	for (i = 0; i < config->n_autoboot_opts; i++) {
 		*(uint32_t *)pos =
-			__cpu_to_be32(config->boot_priorities[i].priority);
+			__cpu_to_be32(config->autoboot_opts[i].boot_type);
 		pos += 4;
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) {
+			*(uint32_t *)pos =
+				__cpu_to_be32(config->autoboot_opts[i].type);
+			pos += 4;
+		} else {
+			pos += pb_protocol_serialise_string(pos,
+						config->autoboot_opts[i].uuid);
+		}
 	}
 
-	pos += pb_protocol_serialise_string(pos, config->boot_device);
-
 	*(uint32_t *)pos = __cpu_to_be32(config->ipmi_bootdev);
 	pos += 4;
 	*(uint32_t *)pos = config->ipmi_bootdev_persistent;
@@ -925,24 +932,26 @@ int pb_protocol_deserialise_config(struct config *config,
 		config->network.dns_servers[i] = str;
 	}
 
-	if (read_u32(&pos, &len, &config->n_boot_priorities))
+	if (read_u32(&pos, &len, &config->n_autoboot_opts))
 		goto out;
-	config->boot_priorities = talloc_array(config, struct boot_priority,
-			config->n_boot_priorities);
+	config->autoboot_opts = talloc_array(config, struct autoboot_option,
+			config->n_autoboot_opts);
 
-	for (i = 0; i < config->n_boot_priorities; i++) {
+	for (i = 0; i < config->n_autoboot_opts; i++) {
 		if (read_u32(&pos, &len, &tmp))
 			goto out;
-		config->boot_priorities[i].priority = (int)tmp;
-		if (read_u32(&pos, &len, &tmp))
-			goto out;
-		config->boot_priorities[i].type = tmp;
+		config->autoboot_opts[i].boot_type = (int)tmp;
+		if (config->autoboot_opts[i].boot_type == BOOT_DEVICE_TYPE) {
+			if (read_u32(&pos, &len, &tmp))
+				goto out;
+			config->autoboot_opts[i].type = tmp;
+		} else {
+			if (read_string(config, &pos, &len, &str))
+				goto out;
+			config->autoboot_opts[i].uuid = str;
+		}
 	}
 
-	if (read_string(config, &pos, &len, &str))
-		goto out;
-	config->boot_device = str;
-
 	if (read_u32(&pos, &len, &config->ipmi_bootdev))
 		goto out;
 	if (read_u32(&pos, &len, &tmp))
diff --git a/lib/types/types.h b/lib/types/types.h
index e22dbc3..3bb8c9b 100644
--- a/lib/types/types.h
+++ b/lib/types/types.h
@@ -113,15 +113,6 @@ struct network_config {
 	unsigned int		n_dns_servers;
 };
 
-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;
-};
-
 struct autoboot_option {
 	enum {
 		BOOT_DEVICE_TYPE,
@@ -138,10 +129,8 @@ struct config {
 	unsigned int		autoboot_timeout_sec;
 	struct network_config	network;
 
-	struct boot_priority	*boot_priorities;
-	unsigned int		n_boot_priorities;
-
-	char			*boot_device;
+	struct autoboot_option	*autoboot_opts;
+	unsigned int		n_autoboot_opts;
 
 	unsigned int		ipmi_bootdev;
 	bool			ipmi_bootdev_persistent;