Merge commit 'erwan-private/master' into for-erwan

Conflicts:

	com32/hdt/hdt-cli.c
	com32/hdt/hdt-cli.h

diff --cc com32/hdt/hdt-cli.h
index acdb9e5,34fddf1..e2b71b2
--- 1/com32/hdt/hdt-cli.h
--- 2/com32/hdt/hdt-cli.h
+++ b/com32/hdt/hdt-cli.h
@@@ -55,20 -56,22 +56,22 @@@
  #define CLI_MODES "modes"
  
  typedef enum {
 -  EXIT_MODE,
 -  HDT_MODE,
 -  PCI_MODE,
 -  DMI_MODE,
 -  CPU_MODE,
 -  PXE_MODE,
 -  KERNEL_MODE,
 -  SYSLINUX_MODE,
 -  VESA_MODE,
 +      EXIT_MODE,
 +      HDT_MODE,
 +      PCI_MODE,
 +      DMI_MODE,
 +      CPU_MODE,
 +      PXE_MODE,
 +      KERNEL_MODE,
 +      SYSLINUX_MODE,
 +      VESA_MODE,
  } cli_mode_t;
  
- struct s_cli_mode {
-       cli_mode_t mode;
-       char prompt[32];
+ struct s_cli {
+   cli_mode_t mode;
+   char prompt[32];
+   char input[MAX_LINE_SIZE];
+   int cursor_pos;
  };
  
  /* A command-line command */