config: Add boot_device member to config

[petitboot] / lib / pb-protocol / pb-protocol.c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index cf27b8ec49c35ff47bfdfff00cc43f36e9f06015..4a5c75a32437b1e4bd201eba7d5a760288ad55ad 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -472,6 +472,8 @@ int pb_protocol_serialise_config(const struct config *config,
                pos += 4;
        }
 
+       pos += pb_protocol_serialise_string(pos, config->boot_device);
+
        assert(pos <= buf + buf_len);
        (void)buf_len;
 
@@ -846,6 +848,7 @@ int pb_protocol_deserialise_config(struct config *config,
        unsigned int len, i, tmp;
        const char *pos;
        int rc = -1;
+       char *str;
 
        len = message->payload_len;
        pos = message->payload;
@@ -878,10 +881,9 @@ int pb_protocol_deserialise_config(struct config *config,
                        config->network.n_dns_servers);
 
        for (i = 0; i < config->network.n_dns_servers; i++) {
-               char *tmp;
-               if (read_string(config->network.dns_servers, &pos, &len, &tmp))
+               if (read_string(config->network.dns_servers, &pos, &len, &str))
                        goto out;
-               config->network.dns_servers[i] = tmp;
+               config->network.dns_servers[i] = str;
        }
 
        if (read_u32(&pos, &len, &config->n_boot_priorities))
@@ -898,6 +900,11 @@ int pb_protocol_deserialise_config(struct config *config,
                config->boot_priorities[i].type = tmp;
        }
 
+       if (read_string(config, &pos, &len, &str))
+               goto out;
+
+       config->boot_device = str;
+
        rc = 0;
 
 out: