summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge the latest changes from upstreambaserock/genivi/morphJonathan Maw2012-11-29145-2876/+13366
|\
| * memdisk: Fix order of sectors/track and bytes/sectorsyslinux-4.06Kenneth J. Davis2012-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swap order of sectors/track with bytes/sector to match diskette parameter table order (as pointed to by INT 1Eh). References: (additional ones available if necessary) 'System BIOS for IBM PC/XT/AT computers and compatibles' by Phoenix Technologies Ltd. copyright 1987,88,89 3rd printing 1990 ISBN: 0-201-51806-6 pages 61-62 'PC Interrupts' 2nd edition by Ralf Brown & Jim Kyle copyright 1994 1st printing 1993 ISBN: 0-201-62485-0 page 211 Note: this fixes an issue with older FreeDOS kernels that expect this structure to contain valid values. Signed-off-by: Kenneth J. Davis <jeremyd@fdos.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * NEWS: Document the VFAT relative path fixMatt Fleming2012-10-231-0/+2
| | | | | | | | Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * README: Clarify the requirements for utils/isohybridMatt Fleming2012-10-231-3/+3
| | | | | | | | | | | | | | | | Be clear that utils/isohybrid requires the UUID library as well as /usr/include/uuid/uuid.h. Reported-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * NEWS: Fix some typosMatt Fleming2012-10-231-4/+4
| | | | | | | | | | Reported-by: Ady <ady-sf@hotmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * doc: minor documentation updatesVanush "Misha" Paturyan2012-10-232-2/+2
| | | | | | | | | | syslinux.txt: syslinux binary is in "linux" directory menu.txt: menu.c32 and vesamenu.c32 are in com32/menu directory
| * Revert "win: Add -mno-ms-bitfields"H. Peter Anvin2012-10-222-6/+5
| | | | | | | | | | | | | | | | | | This reverts commit 7d9ee65cc9577eb69782a49a34895ae80820e9ff. I am concerned that this may cause the Windows ABI header files to be misinterpreted. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| * Packed definition: workaround for mingw + gcc 4.7H. Peter Anvin2012-10-221-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | __attribute__((packed)) does the wrong thing when in ms-struct mode; this breaks compiling on mingw-w64. Therefore force gcc struct mode when we use packed. This obsoletes checkin 7d9ee65 win: Add -mno-ms-bitfields Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| * comboot: remove comapi_chainbootsyslinux-4.06-pre14Sebastian Herbszt2012-10-152-37/+2
| | | | | | | | | | | | | | comapi_chainboot was obsoleted in 3.80. Signed-off-by: Sebastian Herbszt <herbszt@gmx.de> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * comboot: fix documentationSebastian Herbszt2012-10-151-51/+1
| | | | | | | | | | | | | | comapi_shuffle was obsoleted in 3.80. Signed-off-by: Sebastian Herbszt <herbszt@gmx.de> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * README: document the need for /usr/include/uuid/uuid.hGeert Stappers2012-10-151-0/+7
| | | | | | | | | | utils/isohybrid build depends on /usr/include/uuid/uuid.h The package name varies between distribution families.
| * menu: Disallow navigation to a disabled entry via *any* keyMatt Fleming2012-10-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | Generalise the fix from commit c823574f53c1 ("menu: Don't highlight disabled entries") as it only handled the case where we navigated to a disabled last entry by pressing Ctrl + N or the DOWN arrow key. Obviously, we can navigate with other keys such as END, PGDN, etc so we need to handle all cases. Reported-by: Ady <ady-sf@hotmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * prdhcp.c32: Turn off DEBUGsyslinux-4.06-pre13Matt Fleming2012-10-111-1/+1
| | | | | | | | Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * Merge branch 'pxechn-fix-news-for-hpa-2' of git://github.com/geneC/syslinuxMatt Fleming2012-10-115-38/+287
| |\ | | | | | | | | | | | | | | | Conflicts: NEWS com32/modules/Makefile
| | * doc/pxechn.txt: updateGene Cumm2012-09-161-5/+5
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * doc/pxechn.txt: Fix old exampleGene Cumm2012-09-061-4/+1
| | | | | | | | | | | | | | | | | | Command line options changed. Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * doc/pxechn.txt: word wrapGene Cumm2012-09-031-17/+49
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * doc/pxechn.txt: Updates for clarity/flowGene Cumm2012-09-031-27/+33
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * doc/pxechn.txt: Change title for manpage use.Gene Cumm2012-09-031-1/+1
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * prdhcp.c32: Fix what is retrieved.Gene Cumm2012-06-021-2/+3
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * prdhcp.c32: Add to MakefileGene Cumm2012-06-021-1/+1
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * prdhcp.c32: Print DHCP packetsGene Cumm2012-06-021-0/+163
| | | | | | | | | | | | | | | | | | | | | | | | For PXELINUX, print the generically parsed contents of the DHCP packets for examining the options used in all 3. It currently accepts no options. Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * doc/pxechn.txt: add -S, examples, clarifyGene Cumm2012-06-011-8/+11
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * pxechn.c32: add -S to transform sname to siaddrGene Cumm2012-06-011-2/+31
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * doc/pxechn.txt: WDS specifics, example, issueGene Cumm2012-05-311-4/+10
| | | | | | | | | | | | | | | | | | Notes on using the WDS option. Known issue with gPXE/iPXE Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * NEWS: add pxechn.c32Gene Cumm2012-05-291-0/+3
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| | * pxechn: Turn off debugGene Cumm2012-05-281-3/+13
| | | | | | | | | | | | Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| * | win: Add -mno-ms-bitfieldsShao Miller2012-10-112-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent MinGW GCCs now have -mms-bitfields on by default, but it appears to break our intentions with __attribute__((packed)). See GCC bug 52991, http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991 The undesired behaviour was noticed when the win32 installer had troubles identifying the media type field of a boot sector. Signed-off-by: Shao Miller <sha0.miller@gmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | isohybrid: fix isohybrid.c compileFrediano Ziglio2012-10-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make isohybrid.c compile on gcc 4.4 32 bit instead of producing the following error, isohybrid.c: In function ‘lendian_64’: isohybrid.c:437: error: integer constant is too large for ‘long’ type Cc: Matthew Garrett <mjg@redhat.com> Cc: Michal Soltys <soltys@ziu.info> Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | ext2: add additional check to ext2 loaderFrediano Ziglio2012-10-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Check if a pointer is NULL due to specifying an invalid inode group number. Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | mboot: fix typo in commentFrediano Ziglio2012-10-091-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | make some functions static remove unused NADV defineFrediano Ziglio2012-10-092-6/+4
| | | | | | | | | | | | | | | | | | | | | Just some minor cleanup Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | menu: Add MENU GOTO support to the MENU DEFAULT parsing codeMatt Fleming2012-10-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tomas reported that the 'test1' submenu in the following config file snippet doesn't honour the MENU DEFAULT directive, MENU BEGIN test0 MENU START LABEL - MENU DEFAULT MENU LABEL OptionA MENU GOTO test1 MENU END MENU BEGIN test1 LABEL - MENU LABEL OptionA1 MENU GOTO test0 LABEL - MENU DEFAULT MENU LABEL OptionB1 MENU GOTO test0 MENU END The reason is that the menu config code doesn't know how to handle a default item that is a MENU GOTO directive. A trivial addition to the code in record() fixes this. Reported-by: Tomas M <tomas@slax.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | menu: Don't highlight disabled entriesMatt Fleming2012-10-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's an off-by-one bug in the menu input handling code which makes it possible to highlight/select the last entry in a menu even if that entry is disabled. It should be noted that you can't actually *do* anything with the disabled entry, i.e. edit or execute it. Still, allowing it to be highlighted does look a little strange. Reported-by: Matt Sephton <matt.sephton@gmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | com32: Add ifmemdsk.c32 to MakefileMatt Fleming2012-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... so that it actually gets built. This should have been added to the Makefile when ifmemdsk.c was created. Reported-by: Ady <ady-sf@hotmail.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | NEWS: Document changes between 4.05 and 4.06syslinux-4.06-pre12Matt Fleming2012-10-051-0/+8
| | | | | | | | | | | | Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| * | In the current Lua.c32 DMI implementation, it is a flat table with dotted ↵Hung-chi Lihn2012-09-222-208/+420
| | | | | | | | | | | | | | | | | | | | | | | | | | | names in table entries. It also misses a number DMI sub-tables. This patch, cleans up the DMI table structure using Lua's nested table structure and adds all missing DMI sub-tables. If a DMI sub-table is not supported by the hardware (not filled), then the corresponding sub-table will not be generated. This helps to make the table structure cleaner and reflects the actual DMI information. Signed-off-by: Hung-chi Lihn <hlihn@google.com> Signed-off-by: Erwan Velu <erwanaliasr1@gmail.com>
| * | Bug fix: Added the missing entry (boot_from_pcmcia) in struct s_characteristics.Hung-chi Lihn2012-09-221-1/+2
| | | | | | | | | | | | | | | | | | | | | In bios_charac_strings[] of /com32/gpllib/dmi/dmi_bios.c there are actually 29 entries. However, BIOS_CHAR_NB_ELEMENTS in /com32/gplinclude/dmi/dmi_bios.h was defined as 28 and struct s_characteristics in the same file also only had 28 entries. It turns out that there was a missing entry "boot_from_pcmcia" (the 16th entry representing bit 18) in s_characteristics. Signed-off-by: Hung-chi Lihn <hlihn@google.com> Signed-off-by: Erwan Velu <erwanaliasr1@gmail.com>
| * | Added the native syslinux functions config_file(), ipappend_strs(), and ↵Hung-chi Lihn2012-09-221-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reboot() to Lua.c32. This allows the Lua script to query the config file name and the ipappend strings (pxelinux only), as well as to perform reboot (warm and cold) to the system. In Lua.c32, the extension will be used as the following: 1. syslinux.config_file() will return the config file string. 2. syslinux.ipappend_strs() will return a table of IPAPPEND strings with numerical indices. 3. syslinux.reboot() will perform cold reboot, while syslinux.reboot(1) will perform warm reboot. Signed-off-by: Hung-chi Lihn <hlihn@google.com> Signed-off-by: Erwan Velu <erwanaliasr1@gmail.com>
| * | The current Lua.c32 does not enable io.read() due to some missing library ↵Hung-chi Lihn2012-09-221-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions. However, this strongly limits the Lua script from getting user inputs and reading files (even in pxelinux via TFTP). This patch enables io.read() in Lua.c32 with some restrictions: 1. the io.read("*line") is fully supported. 2. the io.read("*number") is not supported due to the missing buffering in underlying file I/Os. However, the user can read a line using io.read() and convert the string to numbers using the built in pattern matching and number conversion features. 3. io.read(bytes) is supported. However, io.read(0) will not be a valid test for EOF due to the missing I/O buffering. io.read() will return nil if EOF is encountered. This offers an alternative way to handle EOF. Signed-off-by: Hung-chi Lihn <hlihn@google.com> Signed-off-by: Erwan Velu <erwanaliasr1@gmail.com>
| * | NEWS: Adding 'silent' option from HDTErwan Velu2012-09-101-1/+1
| | |
| * | hdt: Release 0.5.2hdt/0.5.2Erwan Velu2012-09-101-1/+1
| | | | | | | | | | | | New release with codename Manon
| * | hdt: Adding Silent modeErwan Velu2012-09-103-9/+19
| | | | | | | | | | | | | | | | | | | | | By using the "silent" option at the cmdline, HDT tries not displaying any boring message. This is particulary interesting with the "display" option.
| * | hdt: Removing remaining printf()Erwan Velu2012-09-105-22/+22
| | | | | | | | | | | | Using more_printf allow to manage more easily several pages printing.
| * | NEWS: Updating for HDT & kontron_wdtErwan Velu2012-09-101-0/+6
| | |
| * | kontron_wdt: Fixing makefileErwan Velu2012-09-101-1/+1
| | | | | | | | | | | | Typo.
| * | kontron_wdt: Enforce timeout value if already setErwan Velu2012-09-101-0/+4
| | | | | | | | | | | | | | | If the watchdog was already engaged, let's rewrite the timeout to insure the proper value is set.
| * | kontron_wdt: Adjusting exit pathErwan Velu2012-09-101-7/+10
| | | | | | | | | | | | If we fail, at least let's boot the expected image
| * | kontron_wdt: Adding watchdog com32 moduleErwan Velu2012-09-103-1/+525
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Kontron ETX board, it's possible to initialize and start the watchdog during syslinux booting. This allow protecting a boot sequence with a defined timeout. Bootloader is starting, engage the watchdog and then start a default entry (typically a Linux image). If the loaded OS, feed or reinitalize the watchdog, nothing occurs unless the system will reboot Conflicts: com32/modules/Makefile
| * | Merge remote-tracking branch 'hpa/master'Erwan Velu2012-09-0523-126/+839
| |\ \