[syslinux:master] libinstaller/syslxopt.c: remove unneeded usage text from certain variants.

syslinux-bot for Gene Cumm gene.cumm at gmail.com
Tue Jul 27 18:30:26 PDT 2010


Commit-ID:  e841d6983b3f161a0a8566e8a8b3b18d83e845cf
Gitweb:     http://syslinux.zytor.com/commit/e841d6983b3f161a0a8566e8a8b3b18d83e845cf
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Tue, 27 Jul 2010 18:58:46 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Tue, 27 Jul 2010 18:58:46 -0400

libinstaller/syslxopt.c: remove unneeded usage text from certain variants.

Gert Hulselmans noticed this.


---
 libinstaller/syslxopt.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libinstaller/syslxopt.c b/libinstaller/syslxopt.c
index 18a6baa..786e3d7 100644
--- a/libinstaller/syslxopt.c
+++ b/libinstaller/syslxopt.c
@@ -113,10 +113,17 @@ void __attribute__ ((noreturn)) usage(int rv, enum syslinux_mode mode)
 	    mode == MODE_SYSLINUX  ? "  " : "-o");
     /* Have to chop this roughly in half for the DOS installer for some reason */
     fprintf(stderr,
-	    "  --menu-save= -M  Set the label to select as default on the next boot\n"
+	    "  --menu-save= -M  Set the label to select as default on the next boot\n");
+    switch (mode) {
+    case MODE_SYSLINUX_DOSWIN:
+	fprintf(stderr,
 	    "  --mbr        -m  Install an MBR (DOS/Win32 installers only)\n"
-	    "  --active     -a  Mark partition as active (DOS/Win32 installers only)\n"
-	    "  --force      -f  Ignore precautions (DOS/Win32/mtools installers only)\n"
+	    "  --active     -a  Mark partition as active (DOS/Win32 installers only)\n");
+    case MODE_SYSLINUX:
+	fprintf(stderr,
+	    "  --force      -f  Ignore precautions (DOS/Win32/mtools installers only)\n");
+    }
+    fprintf(stderr,
 	    "\n"
 	    "  Note: geometry is determined at boot time for devices which\n"
 	    "  are considered hard disks by the BIOS.  Unfortunately, this is\n"



More information about the Syslinux-commits mailing list