discover/user-event: Use bootfile_url if available
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>
Thu, 10 May 2018 05:47:56 +0000 (15:47 +1000)
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>
Tue, 10 Jul 2018 04:42:56 +0000 (14:42 +1000)
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
discover/user-event.c

index ee282bb48c7f6b909134e42ef1388e0c27b9cde9..128186beb0468be9f17c321e4d61199ac1746693 100644 (file)
@@ -251,13 +251,14 @@ static char *parse_ip_addr(struct discover_context *ctx, const char *ip)
 struct pb_url *user_event_parse_conf_url(struct discover_context *ctx,
                struct event *event, bool *is_complete)
 {
-       const char *conffile, *pathprefix, *host, *bootfile;
+       const char *conffile, *pathprefix, *host, *bootfile, *bootfile_url;
        char *p, *basedir, *url_str;
        struct pb_url *url;
 
        conffile = event_get_param(event, "pxeconffile");
        pathprefix = event_get_param(event, "pxepathprefix");
        bootfile = event_get_param(event, "bootfile");
+       bootfile_url = event_get_param(event, "bootfile_url");
 
        /* If we're given a conf file, we're able to generate a complete URL to
         * the configuration file, and the parser doesn't need to do any
@@ -288,6 +289,12 @@ struct pb_url *user_event_parse_conf_url(struct discover_context *ctx,
        host = parse_host_addr(event);
        if (!host) {
                pb_log("%s: host address not found\n", __func__);
+
+               /* No full URLs and no host address? Check for DHCPv6 options */
+               if (bootfile_url && is_url(bootfile_url)) {
+                       *is_complete = true;
+                       return pb_url_parse(ctx, bootfile_url);
+               }
                return NULL;
        }