From: Michal Soltys <soltys@ziu.info>
Date: Tue, 8 Mar 2011 00:43:01 +0000 (+0100)
Subject: com32/chain: option rename: mbrchs -> fixchs
X-Git-Tag: syslinux-4.06-pre3~3^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e63b3ed60d172ab751300bcf9b620bee33e92451;p=profile%2Fivi%2Fsyslinux.git

com32/chain: option rename: mbrchs -> fixchs

Signed-off-by: Michal Soltys <soltys@ziu.info>
---

diff --git a/com32/chain/mangle.c b/com32/chain/mangle.c
index 1dea116..0aece16 100644
--- a/com32/chain/mangle.c
+++ b/com32/chain/mangle.c
@@ -577,7 +577,7 @@ int manglepe_fixchs(struct part_iter *miter)
     struct disk_dos_part_entry *dp;
     int ridx;
 
-    if (!opt.mbrchs)
+    if (!opt.fixchs)
 	return 0;
 
     if (miter->type != typedos) {
diff --git a/com32/chain/options.c b/com32/chain/options.c
index 1896062..7d85061 100644
--- a/com32/chain/options.c
+++ b/com32/chain/options.c
@@ -82,7 +82,7 @@ Usage:\n\
     hideall              Hide *all* partitions, unhide selected partition\n\
     unhide               Unhide primary partitions\n\
     unhideall            Unhide *all* partitions\n\
-    nombrchs             Walk *all* partitions and fix E/MBRs' chs values\n\
+    nofixchs             Walk *all* partitions and fix E/MBRs' chs values\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\
@@ -277,10 +277,10 @@ int opt_parse_args(int argc, char *argv[])
 	    opt.save = true;
 	} else if (!strcmp(argv[i], "nosave")) {
 	    opt.save = false;
-	} else if (!strcmp(argv[i], "mbrchs")) {
-	    opt.mbrchs = true;
-	} else if (!strcmp(argv[i], "nombrchs")) {
-	    opt.mbrchs = false;
+	} else if (!strcmp(argv[i], "fixchs")) {
+	    opt.fixchs = true;
+	} else if (!strcmp(argv[i], "nofixchs")) {
+	    opt.fixchs = false;
 	} else if (!strcmp(argv[i], "warn")) {
 	    opt.warn = true;
 	} else if (!strcmp(argv[i], "nowarn")) {
diff --git a/com32/chain/options.h b/com32/chain/options.h
index 17c6a73..2e60f2c 100644
--- a/com32/chain/options.h
+++ b/com32/chain/options.h
@@ -30,7 +30,7 @@ struct options {
     bool bss;
     bool setbpb;
     bool filebpb;
-    bool mbrchs;
+    bool fixchs;
     bool warn;
     bool chain;
     uint16_t keeppxe;
diff --git a/doc/chain.txt b/doc/chain.txt
index 2624310..66615bb 100644
--- a/doc/chain.txt
+++ b/doc/chain.txt
@@ -45,7 +45,7 @@ or
 This is useful for invocations such as:
 
 chain.c32 hdN M setbpb save nochain
-chain.c32 hdN mbrchs nochain
+chain.c32 hdN fixchs nochain
 chain.c32 hdN unhideall nochain
 
 Please see respective options for more details.
@@ -207,8 +207,8 @@ one we're booting from. Hiding is performed only on the selected drive. Options
 starting with 'un' will simply unhide every partition (primary ones or all).
 Writing is only performed, if the os type values actually changed.
 
-	mbrchs
-	*nombrchs
+	fixchs
+	*nofixchs
 
 If you want to make a drive you're booting from totally compatible with current
 BIOS, you can use this to fix all partitions' CHS numbers. Good to silence e.g.
@@ -239,7 +239,7 @@ everything requested as usual, but it will not perform the actual chainloading.
 'nochain' option disables handover, file loading and sector mapping, as these
 are pointless in such scenario (although file might be reenabled in some future
 version, if writing to actual files becomes possible). Mainly useful for
-options 'mbrchs', '[un]hide[all]' and setbpb.
+options 'fixchs', '[un]hide[all]' and setbpb.
 
 	isolinux=<file>
 	sets: file=<file> nohand nosect isolinux