d_opt->boot_image = user_event_resource(d_opt, event, false);
if (!d_opt->boot_image) {
d_opt->boot_image = user_event_resource(d_opt, event, false);
if (!d_opt->boot_image) {
struct pb_url *user_event_parse_conf_url(struct discover_context *ctx,
struct event *event, bool *is_complete)
{
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");
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");
/* 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
/* 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
- pb_log("%s: host address not found\n", __func__);
+ pb_log_fn("host address not found\n");
+
+ /* 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);
+ }
len = recvfrom(uev->socket, buf, PBOOT_USER_EVENT_SIZE, 0, NULL, NULL);
if (len < 0) {
len = recvfrom(uev->socket, buf, PBOOT_USER_EVENT_SIZE, 0, NULL, NULL);
if (len < 0) {