summaryrefslogtreecommitdiffstats
path: root/discover
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-02-27 10:33:13 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-02-27 13:24:23 +0800
commit30dce4ce0447802e3b54b3f760c5fd8eacbe75ff (patch)
tree2bbe9adfa18f15859d3d5a1343b6c4a8e3215639 /discover
parent9c950743461770220231d320db8c372aa74f9163 (diff)
downloadtalos-petitboot-30dce4ce0447802e3b54b3f760c5fd8eacbe75ff.tar.gz
talos-petitboot-30dce4ce0447802e3b54b3f760c5fd8eacbe75ff.zip
discover/pxe: Add pxelinux.cfg/ directory to autodiscovered pxe paths
The pxelinux project will perform autodiscovery by looking for files under the pxelinux.cfg/ prefix (in addition to any pxepathprefix from DHCP option 210) This change unifies petitboot's behaviour with pxelinux. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover')
-rw-r--r--discover/pxe-parser.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c
index e245f1b..17ae55e 100644
--- a/discover/pxe-parser.c
+++ b/discover/pxe-parser.c
@@ -14,6 +14,8 @@
#include "paths.h"
#include "user-event.h"
+static const char *pxelinux_prefix = "pxelinux.cfg/";
+
struct pxe_parser_info {
struct discover_boot_option *opt;
const char *default_name;
@@ -97,9 +99,9 @@ static void pxe_process_pair(struct conf_context *ctx,
static int pxe_parse(struct discover_context *dc)
{
+ struct pb_url *pxe_base_url, *url;
struct pxe_parser_info *parser_info;
char **pxe_conf_files, **filename;
- struct pb_url *conf_url, *url;
struct conf_context *conf;
bool complete_url;
int len, rc;
@@ -122,13 +124,12 @@ static int pxe_parse(struct discover_context *dc)
parser_info = talloc_zero(conf, struct pxe_parser_info);
conf->parser_info = parser_info;
- conf_url = user_event_parse_conf_url(dc, dc->event, &complete_url);
- if (!conf_url)
+ dc->conf_url = user_event_parse_conf_url(dc, dc->event, &complete_url);
+ if (!dc->conf_url)
goto out_conf;
if (complete_url) {
/* we have a complete URL; use this and we're done. */
- dc->conf_url = conf_url;
rc = parser_request_url(dc, dc->conf_url, &buf, &len);
if (rc)
goto out_conf;
@@ -139,10 +140,14 @@ static int pxe_parse(struct discover_context *dc)
rc = -1;
+ pxe_base_url = pb_url_join(dc, dc->conf_url, pxelinux_prefix);
+ if (!pxe_base_url)
+ goto out_pxe_conf;
+
for (filename = pxe_conf_files; *filename; filename++) {
- url = pb_url_join(dc, conf_url, *filename);
+ url = pb_url_join(dc, pxe_base_url, *filename);
if (!url)
- goto out_pxe_conf;
+ continue;
rc = parser_request_url(dc, url, &buf, &len);
if (!rc) /* found one, just break */
@@ -151,13 +156,12 @@ static int pxe_parse(struct discover_context *dc)
talloc_free(url);
}
+ talloc_free(pxe_base_url);
+
/* No configuration file found on the boot server */
if (rc)
goto out_pxe_conf;
- dc->conf_url = url;
-
- talloc_free(conf_url);
talloc_free(pxe_conf_files);
}
OpenPOWER on IntegriCloud