diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2014-04-26 10:50:14 -0500 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2014-04-26 10:50:14 -0500 |
| commit | fb578a53288ecf8b0d9bbc5ebfbaead6f5b9a5e9 (patch) | |
| tree | 92549bca11c2bc10603074b4fc3aacaa090f158c | |
| parent | 010232aa443377cc848cd60fc55cf53d2db4b286 (diff) | |
| download | u-boot-fb578a53288ecf8b0d9bbc5ebfbaead6f5b9a5e9.tar.gz u-boot-fb578a53288ecf8b0d9bbc5ebfbaead6f5b9a5e9.tar.xz u-boot-fb578a53288ecf8b0d9bbc5ebfbaead6f5b9a5e9.zip | |
PXE: syslinux implenets some keywords found in configs we do not support
distros write out extlinux.conf files and documentation lists pxe config
options we do not support. today the user gets ugly messages like:
Ignoring unknown command: ui
Ignoring malformed menu command: autoboot
Ignoring malformed menu command: hidden
Ignoring unknown command: totaltimeout
instead fo printing the messages for known but unsupported options lets
silently pass over them.
| -rw-r--r-- | common/cmd_pxe.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index eb5f9c38f3..18e140dfbe 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -825,7 +825,8 @@ enum token_type { T_FDTDIR, T_ONTIMEOUT, T_IPAPPEND, - T_INVALID + T_INVALID, + T_UNIMPLEMENTED }; /* @@ -858,6 +859,10 @@ static const struct token keywords[] = { {"fdtdir", T_FDTDIR}, {"ontimeout", T_ONTIMEOUT,}, {"ipappend", T_IPAPPEND,}, + {"ui", T_UNIMPLEMENTED}, + {"autoboot", T_UNIMPLEMENTED}, + {"hidden", T_UNIMPLEMENTED}, + {"totaltimeout", T_UNIMPLEMENTED}, {NULL, T_INVALID} }; @@ -1127,6 +1132,9 @@ static int parse_menu(cmd_tbl_t *cmdtp, char **c, struct pxe_menu *cfg, char *b, nest_level + 1); break; + case T_UNIMPLEMENTED: + break; + default: printf("Ignoring malformed menu command: %.*s\n", (int)(*c - s), s); @@ -1351,6 +1359,9 @@ static int parse_pxefile_top(cmd_tbl_t *cmdtp, char *p, struct pxe_menu *cfg, in case T_EOF: return 1; + case T_UNIMPLEMENTED: + break; + default: printf("Ignoring unknown command: %.*s\n", (int)(p - s), s); |