[syslinux:master] config.c32: accept an optional new directory
syslinux-bot for H. Peter Anvin
hpa at linux.intel.com
Mon Jun 28 14:39:18 PDT 2010
Commit-ID: 3502961e0405a274619c5ca88cc9bc467c80709a
Gitweb: http://syslinux.zytor.com/commit/3502961e0405a274619c5ca88cc9bc467c80709a
Author: H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Mon, 28 Jun 2010 14:37:45 -0700
Committer: H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Mon, 28 Jun 2010 14:37:45 -0700
config.c32: accept an optional new directory
Accept an optional new directory to config.c32, just as we permit for
the CONFIG statement.
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
---
com32/modules/config.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/com32/modules/config.c b/com32/modules/config.c
index fb6cb86..334a635 100644
--- a/com32/modules/config.c
+++ b/com32/modules/config.c
@@ -26,12 +26,13 @@ int main(int argc, char *argv[])
{
openconsole(&dev_null_r, &dev_stdcon_w);
- if (argc != 2) {
- fprintf(stderr, "Usage: config <filename>\n");
+ if (argc < 2 || argc > 3) {
+ fprintf(stderr, "Usage: config <filename> [<directory>]\n");
return 1;
}
- syslinux_run_kernel_image(argv[1], "", 0, IMAGE_TYPE_CONFIG);
+ syslinux_run_kernel_image(argv[1], argv[2] ? argv[2] : "",
+ 0, IMAGE_TYPE_CONFIG);
fprintf(stderr, "config: %s: failed to load (missing file?)\n", argv[1]);
return 1;
More information about the Syslinux-commits
mailing list