diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-10-18 13:04:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-04 11:24:22 -0500 |
| commit | e5a9a4076f1fb9fb9ce53c2aec32422073bbc66a (patch) | |
| tree | 6ca5540adfae4503242ece100b3cd9eed65fb26f | |
| parent | 5b6da28352f4ae64d78a12e608133c1b876b992c (diff) | |
| download | u-boot-imx-e5a9a4076f1fb9fb9ce53c2aec32422073bbc66a.zip u-boot-imx-e5a9a4076f1fb9fb9ce53c2aec32422073bbc66a.tar.gz u-boot-imx-e5a9a4076f1fb9fb9ce53c2aec32422073bbc66a.tar.bz2 | |
pxe: fix handling of absolute paths
pxelinux and syslinux differ in their handling of absolute paths in menu
files. A pxelinux path is aways prepended with the bootfile path while
syslinux allows for absolute paths. u-boot was always treating a leading
/ as an absolute path breaking some pxelinux setups. Fix this by adding
a flag to distinguish pxelinux vs. syslinux behavior.
Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
| -rw-r--r-- | common/cmd_pxe.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 79d3a06..db6b156 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -25,6 +25,8 @@ const char *pxe_default_paths[] = { NULL }; +static bool is_pxe; + /* * Like getenv, but prints an error if envvar isn't defined in the * environment. It always returns what getenv does, so it can be used in @@ -84,7 +86,8 @@ static int get_bootfile_path(const char *file_path, char *bootfile_path, char *bootfile, *last_slash; size_t path_len = 0; - if (file_path[0] == '/') + /* Only syslinux allows absolute paths */ + if (file_path[0] == '/' && !is_pxe) goto ret; bootfile = from_env("bootfile"); @@ -1472,6 +1475,8 @@ int do_pxe(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (argc < 2) return CMD_RET_USAGE; + is_pxe = true; + /* drop initial "pxe" arg */ argc--; argv++; @@ -1504,6 +1509,8 @@ int do_sysboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *filename; int prompt = 0; + is_pxe = false; + if (strstr(argv[1], "-p")) { prompt = 1; argc--; |