diff options
author | Michal Soltys <soltys@ziu.info> | 2011-03-18 08:33:41 +0100 |
---|---|---|
committer | Michal Soltys <soltys@ziu.info> | 2011-03-18 08:33:41 +0100 |
commit | 0fa69a9b3538d1981bfc00b5444d038aba20ebe3 (patch) | |
tree | d3a6000ebcae0488089df22f30dd54a5506b77a3 /com32/chain | |
parent | a507a1561d11c9aa0eb9d23bc3008f58248c8b4b (diff) | |
download | syslinux-0fa69a9b3538d1981bfc00b5444d038aba20ebe3.tar.gz |
com32/chain: change 'nochain' -> 'stop', update docs
Signed-off-by: Michal Soltys <soltys@ziu.info>
Diffstat (limited to 'com32/chain')
-rw-r--r-- | com32/chain/chain.c | 2 | ||||
-rw-r--r-- | com32/chain/options.c | 12 | ||||
-rw-r--r-- | com32/chain/options.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/com32/chain/chain.c b/com32/chain/chain.c index 784d636a..e35eee51 100644 --- a/com32/chain/chain.c +++ b/com32/chain/chain.c @@ -641,7 +641,7 @@ int main(int argc, char *argv[]) wait_key(); } - if (ndata && opt.chain) /* boot only if we actually chainload */ + if (ndata && !opt.stop) /* boot only if we actually chainload */ do_boot(data, ndata); else error("Service-only run completed, exiting.\n"); diff --git a/com32/chain/options.c b/com32/chain/options.c index 7d850619..791bcbba 100644 --- a/com32/chain/options.c +++ b/com32/chain/options.c @@ -86,7 +86,7 @@ Usage:\n\ nokeeppxe Keep the PXE and UNDI stacks in memory (PXELINUX)\n\ nowarn Wait for a keypress to continue chainloading\n\ - useful to see emited warnings\n\ - chain Actually perform the chainloading\n\ + nostop Actually perform the chainloading\n\ ", "\ \nOptions continued ...\n\ file=<file> Load and execute <file>\n\ @@ -124,7 +124,7 @@ void opt_set_defs(void) opt.sect = true; /* by def. load sector */ opt.maps = true; /* by def. map sector */ opt.hand = true; /* by def. prepare handover */ - opt.chain = true; /* by def. do chainload */ + opt.stop = false; /* by def. do chainload */ opt.foff = opt.soff = opt.fip = opt.sip = 0x7C00; opt.drivename = "boot"; #ifdef DEBUG @@ -285,10 +285,10 @@ int opt_parse_args(int argc, char *argv[]) opt.warn = true; } else if (!strcmp(argv[i], "nowarn")) { opt.warn = false; - } else if (!strcmp(argv[i], "chain")) { - opt.chain = true; - } else if (!strcmp(argv[i], "nochain")) { - opt.chain = false; + } else if (!strcmp(argv[i], "nostop")) { + opt.stop = false; + } else if (!strcmp(argv[i], "stop")) { + opt.stop = true; opt.file = NULL; opt.maps = false; opt.hand = false; diff --git a/com32/chain/options.h b/com32/chain/options.h index 2e60f2c5..1f34cd02 100644 --- a/com32/chain/options.h +++ b/com32/chain/options.h @@ -32,7 +32,7 @@ struct options { bool filebpb; bool fixchs; bool warn; - bool chain; + bool stop; uint16_t keeppxe; struct syslinux_rm_regs regs; }; |