discover: Clear default-boot-device when invalidated

[petitboot] / discover / pxe-parser.c

diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index 98e160373a90f25c68fe22434d60d84ee9dfda19..95547c389799ab06ed7dc4f5a06f937e9ed4743e 100644 (file)
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -2,17 +2,21 @@
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
 #endif
+#include <stdlib.h>
 #include <string.h>
 
 #include <talloc/talloc.h>
 #include <url/url.h>
+#include <log/log.h>
 
 #include "parser.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
 #include "resource.h"
 #include "paths.h"
+#include "event.h"
 #include "user-event.h"
+#include "network.h"
 
 static const char *pxelinux_prefix = "pxelinux.cfg/";
 
@@ -58,7 +62,7 @@ static struct pb_url *pxe_url_join(void *ctx, const struct pb_url *url,
        } else {
                const char *tmp;
                /* strip leading slashes */
-               for (tmp = s; *tmp == '/'; tmp++);
+               for (tmp = s; *tmp == '/'; tmp++)
                        ;
                new_url = pb_url_join(ctx, url, tmp);
        }
@@ -66,6 +70,53 @@ static struct pb_url *pxe_url_join(void *ctx, const struct pb_url *url,
        return new_url;
 }
 
+static void pxe_append_string(struct discover_boot_option *opt,
+               const char *str)
+{
+       if (opt->option->boot_args)
+               opt->option->boot_args = talloc_asprintf_append(
+                               opt->option->boot_args, " %s", str);
+       else
+               opt->option->boot_args = talloc_strdup(opt->option, str);
+}
+
+static char *pxe_sysappend_mac(void *ctx, uint8_t *mac)
+{
+       if (!mac)
+               return NULL;
+
+       return talloc_asprintf(ctx,
+               "BOOTIF=01-%02x-%02x-%02x-%02x-%02x-%02x",
+               mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+}
+
+static void pxe_process_sysappend(struct discover_context *ctx,
+               struct discover_boot_option *opt,
+               unsigned long val)
+{
+       struct event *event = ctx->event;
+       char *str = NULL;
+
+       if (!event)
+               return;
+
+       if (val & 0x2) {
+               uint8_t *mac = find_mac_by_name(ctx, ctx->network,
+                                       event->device);
+               str = pxe_sysappend_mac(ctx, mac);
+               if (str) {
+                       pxe_append_string(opt, str);
+                       talloc_free(str);
+               }
+               val &= ~0x2;
+       }
+
+       if (val)
+               pb_log("pxe: unsupported features requested in "
+                               "ipappend/sysappend: 0x%04lx", val);
+
+}
+
 static void pxe_process_pair(struct conf_context *ctx,
                const char *name, char *value)
 {
@@ -120,7 +171,7 @@ static void pxe_process_pair(struct conf_context *ctx,
        } else if (streq(name, "APPEND")) {
                char *str, *end;
 
-               opt->option->boot_args = talloc_strdup(opt->option, value);
+               pxe_append_string(opt, value);
 
                str = strcasestr(value, "INITRD=");
                if (str) {
@@ -131,6 +182,13 @@ static void pxe_process_pair(struct conf_context *ctx,
                        url = pxe_url_join(ctx->dc, ctx->dc->conf_url, str);
                        opt->initrd = create_url_resource(opt, url);
                }
+       } else if (streq(name, "SYSAPPEND") || streq(name, "IPAPPEND")) {
+               unsigned long type;
+               char *end;
+
+               type = strtoul(value, &end, 10);
+               if (end != value && !(*end))
+                       pxe_process_sysappend(ctx->dc, opt, type);
        }
 
 }