diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2014-02-27 11:39:41 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2014-02-27 13:24:24 +0800 |
| commit | 922756a3aefd8ba5c5675efd37df9f43938cf432 (patch) | |
| tree | da192b7fc978742402f88d487b69a3a0d393d19a | |
| parent | 30dce4ce0447802e3b54b3f760c5fd8eacbe75ff (diff) | |
| download | talos-petitboot-922756a3aefd8ba5c5675efd37df9f43938cf432.tar.gz talos-petitboot-922756a3aefd8ba5c5675efd37df9f43938cf432.zip | |
discover/pxe: Fix prefix autodetection when bootfile is in the root dir
Currently, if the bootfile doesn't contain a directory, the path we use
for config file resolution will use the bootfile as the first component
of path.
For example, if bootfile is:
pxelinux.0
the config files requested will be:
pxelinux.0/<mac>
pxelinux.0/<ips>
pxelinux.0/default
For cases where bootfile is a single file, we need to use a blank
prefix.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
| -rw-r--r-- | discover/user-event.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/discover/user-event.c b/discover/user-event.c index 1e366ee..cf7f20c 100644 --- a/discover/user-event.c +++ b/discover/user-event.c @@ -290,8 +290,9 @@ struct pb_url *user_event_parse_conf_url(struct discover_context *ctx, /* strip filename from the bootfile path, leaving only a * directory */ p = strrchr(basedir, '/'); - if (p) - *p = '\0'; + if (!p) + p = basedir; + *p = '\0'; if (strlen(basedir)) url_str = talloc_asprintf_append(url_str, "%s/", |
