[syslinux:master] hdt: Fixing vesa detection

[syslinux-bot for Erwan Velu]

Commit-ID:  992d57ecc74ce87693260b22e36527613b76c0e7
Gitweb:     http://syslinux.zytor.com/commit/992d57ecc74ce87693260b22e36527613b76c0e7
Author:     Erwan Velu <erwanaliasr1 at gmail.com>
AuthorDate: Thu, 3 Feb 2011 22:06:25 +0100
Committer:  Erwan Velu <erwanaliasr1 at gmail.com>
CommitDate: Thu, 3 Feb 2011 22:06:25 +0100

hdt: Fixing vesa detection

When booting by using the VESA mode, the init order wasn't correct.
This was introduced by commit 460a711a8d3e0c71abe9edaf15cbb366d0f70c81

Thx Ralf Carl for reporting this.


---
 com32/hdt/floppy/hdt.cfg |    2 +-
 com32/hdt/hdt-common.c   |    4 ++--
 com32/hdt/hdt.c          |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/com32/hdt/floppy/hdt.cfg b/com32/hdt/floppy/hdt.cfg
index ca3e042..f72a213 100644
--- a/com32/hdt/floppy/hdt.cfg
+++ b/com32/hdt/floppy/hdt.cfg
@@ -60,7 +60,7 @@ COM32 hdt.c32
 APPEND modules_pcimap=modules.pcimap modules_alias=modules.alias pciids=pci.ids quiet vesa nomenu auto='show summary'
 
 LABEL verbose
-MENU LABEL CLI (Verbose)
+MENU LABEL CLI (VESA mode & Verbose)
 TEXT HELP
  Starts HDT using the Command Line Interface (CLI) using the verbose mode
  VESA mode is enabled
diff --git a/com32/hdt/hdt-common.c b/com32/hdt/hdt-common.c
index eaeaff9..f1557b8 100644
--- a/com32/hdt/hdt-common.c
+++ b/com32/hdt/hdt-common.c
@@ -95,7 +95,7 @@ void detect_parameters(const int argc, const char *argv[],
 	    convert_isolinux_filename(hardware->memtest_label, hardware);
 	} else if (!strncmp(argv[i], "vesa", 4)) {
 	    vesamode = true;
-	    max_console_lines = MAX_CLI_LINES;
+	    max_console_lines = MAX_VESA_CLI_LINES;
 	    /* If the user defines a background image */
 	    if (!strncmp(argv[i], "vesa=", 5)) {
 		strlcpy(hardware->vesa_background, argv[i] + 5,
@@ -103,7 +103,7 @@ void detect_parameters(const int argc, const char *argv[],
 	    }
 	} else if (!strncmp(argv[i], "novesa", 6)) {
 	    vesamode = false;
-	    max_console_lines = MAX_VESA_CLI_LINES;
+	    max_console_lines = MAX_CLI_LINES;
 	} else if (!strncmp(argv[i], "nomenu", 6)) {
 	    menumode = false;
 	} else if (!strncmp(argv[i], "auto=", 5)) {
diff --git a/com32/hdt/hdt.c b/com32/hdt/hdt.c
index 2010438..a1e3923 100644
--- a/com32/hdt/hdt.c
+++ b/com32/hdt/hdt.c
@@ -53,9 +53,6 @@ int main(const int argc, const char *argv[])
     snprintf(version_string, sizeof version_string, "%s %s (%s)",
 	     PRODUCT_NAME, VERSION, CODENAME);
 
-    /* Opening the Syslinux console */
-    init_console(&hardware);
-
     /* Cleaning structures */
     init_hardware(&hardware);
 
@@ -65,6 +62,9 @@ int main(const int argc, const char *argv[])
     /* Detecting parameters */
     detect_parameters(argc, argv, &hardware);
 
+    /* Opening the Syslinux console */
+    init_console(&hardware);
+
     /* Detect hardware */
     detect_hardware(&hardware);