Merge branch 'master' into chouffe

Conflicts:
	com32/hdt/hdt.h

diff --cc com32/hdt/Makefile
index 8cd96f2,96af05f..24e63c2
--- 1/com32/hdt/Makefile
--- 2/com32/hdt/Makefile
+++ b/com32/hdt/Makefile
@@@ -43,10 -43,8 +43,9 @@@ ISOLINUX_DIR            ?= isolinu
  FLOPPY_DIR            ?= floppy
  PCI_IDS_FILE            ?= $(PWD)/$(FLOPPY_DIR)/pci.ids
  GZ_PCI_IDS_FILE         ?= $(PCI_IDS_FILE).gz
- REBOOT_COM32            ?= $(com32)/modules/reboot.c32
  MENU_COM32              ?= $(com32)/menu/menu.c32
  ART_DIR                 ?= art/
 +QEMU                  ?= qemu-kvm
  
  all: $(MODULES) $(TESTFILES)
  

diff --cc com32/hdt/hdt-cli-cpu.c
Simple merge

diff --cc com32/hdt/hdt-cli-hdt.c
Simple merge

diff --cc com32/hdt/hdt-cli-kernel.c
Simple merge

diff --cc com32/hdt/hdt-cli-pci.c
Simple merge

diff --cc com32/hdt/hdt-cli-pxe.c
Simple merge

diff --cc com32/hdt/hdt-cli.c
Simple merge

diff --cc com32/hdt/hdt-cli.h
Simple merge

diff --cc com32/hdt/hdt-common.c
index b117047,5a187f2..ded079e
--- 1/com32/hdt/hdt-common.c
--- 2/com32/hdt/hdt-common.c
+++ b/com32/hdt/hdt-common.c
@@@ -75,10 -69,8 +75,10 @@@ void detect_parameters(const int argc, 
      for (int i = 1; i < argc; i++) {
        if (!strncmp(argv[i], "quiet", 5)) {
            quiet = true;
 +      } else  if (!strncmp(argv[i], "verbose", 7)) {
 +          quiet = false;
        } else if (!strncmp(argv[i], "modules_pcimap=", 15)) {
-           strncpy(hardware->modules_pcimap_path, argv[i] + 15,
+           strlcpy(hardware->modules_pcimap_path, argv[i] + 15,
                    sizeof(hardware->modules_pcimap_path));
            convert_isolinux_filename(hardware->modules_pcimap_path, hardware);
        } else if (!strncmp(argv[i], "pciids=", 7)) {

diff --cc com32/hdt/hdt-common.h
Simple merge

diff --cc com32/hdt/hdt-menu.c
Simple merge