From: Erwan Velu <erwanaliasr1@gmail.com>
Date: Tue, 25 Jan 2011 19:41:50 +0000 (+0100)
Subject: Merge branch 'master' into chouffe
X-Git-Tag: syslinux-4.04-pre6~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=995558ff657a357b3e44a299525ff66dbb0300b3;p=platform%2Fupstream%2Fsyslinux.git

Merge branch 'master' into chouffe

Conflicts:
	com32/hdt/hdt.h
---

995558ff657a357b3e44a299525ff66dbb0300b3
diff --cc com32/hdt/Makefile
index 8cd96f2,96af05f..24e63c2
--- a/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-common.c
index b117047,5a187f2..ded079e
--- a/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)) {