diff options
author | Michal Soltys <soltys@ziu.info> | 2011-05-10 13:52:00 +0200 |
---|---|---|
committer | Michal Soltys <soltys@ziu.info> | 2011-05-10 13:54:10 +0200 |
commit | 312d090bf8eddc8c02189693b8bab89d6e7282f2 (patch) | |
tree | ce48051fefb83d84ccb224d90e69af7ec5f0e020 /com32/chain | |
parent | e90afd56575c79460a6ca0dda100a8f5bf0a564a (diff) | |
download | syslinux-312d090bf8eddc8c02189693b8bab89d6e7282f2.tar.gz |
com32/chain: once more rename option: stop -> break
Seems to be most appropriate...
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 | 18 | ||||
-rw-r--r-- | com32/chain/options.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/com32/chain/chain.c b/com32/chain/chain.c index e35eee51..bb7d2a40 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.stop) /* boot only if we actually chainload */ + if (ndata && !opt.brkchain) /* 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 a897c325..658a45ca 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\ - nostop Actually perform the chainloading\n\ + nobreak Actually perform the chainloading\n\ ", "\ \nOptions continued ...\n\ file=<file> Load and execute <file>\n\ @@ -122,10 +122,10 @@ Usage:\n\ void opt_set_defs(void) { memset(&opt, 0, sizeof(opt)); - opt.sect = true; /* by def. load sector */ - opt.maps = true; /* by def. map sector */ - opt.hand = true; /* by def. prepare handover */ - opt.stop = false; /* by def. do chainload */ + opt.sect = true; /* by def. load sector */ + opt.maps = true; /* by def. map sector */ + opt.hand = true; /* by def. prepare handover */ + opt.brkchain = false; /* by def. do chainload */ opt.foff = opt.soff = opt.fip = opt.sip = 0x7C00; opt.drivename = "boot"; #ifdef DEBUG @@ -300,10 +300,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], "nostop")) { - opt.stop = false; - } else if (!strcmp(argv[i], "stop")) { - opt.stop = true; + } else if (!strcmp(argv[i], "nobreak")) { + opt.brkchain = false; + } else if (!strcmp(argv[i], "break")) { + opt.brkchain = true; opt.file = NULL; opt.maps = false; opt.hand = false; diff --git a/com32/chain/options.h b/com32/chain/options.h index 1f34cd02..4493ef1f 100644 --- a/com32/chain/options.h +++ b/com32/chain/options.h @@ -32,7 +32,7 @@ struct options { bool filebpb; bool fixchs; bool warn; - bool stop; + bool brkchain; uint16_t keeppxe; struct syslinux_rm_regs regs; }; |