summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* NEWS: add grubcfg= and whichsys.c32chain_grubcfgGert Hulselmans2010-07-061-3/+3
| | | | Add grubcfg= and whichsys.c32 to the NEWS file.
* NEWS: add grubcfg= and whichsys.c32Gert Hulselmans2010-07-061-0/+4
| | | | Add grubcfg= and whichsys.c32 to the NEWS file.
* Merge remote branch 'gerth/whichsys'H. Peter Anvin2010-07-052-1/+129
|\
| * whichsys.c32: execute specific command, based on Syslinux bootloader variantwhichsysGert Hulselmans2010-07-052-1/+129
| | | | | | | | | | | | | | | | | | | | | | Detemine which command to execute, based on the Syslinux bootloader variant from which you run it. Usage: whichsys.c32 [-iso- command] [-pxe- command] [-sys- command] Examples: whichsys.c32 -iso- chain.c32 hd0 -sys- chain.c32 hd1 swap whichsys.c32 -iso- config iso.cfg -sys- sys.cfg -pxe- pxe.cfg Signed-off-by: Gert Hulselmans <gerth@zytor.com>
* | Merge remote branch 'gerth/chain_grubcfg'H. Peter Anvin2010-07-051-9/+112
|\ \
| * | chain.c32: Put declaration of *stage2 before common codeGert Hulselmans2010-07-051-2/+2
| | | | | | | | | | | | | | | | | | Put declaration of *stage2 before common code. Signed-off-by: Gert Hulselmans <gerth@zytor.com>
| * | chain.c32: add grubcfg= for passing an alternative config filename to GRUB ↵Gert Hulselmans2010-07-041-9/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy and cleanup the root partition passing GRUB Legacy reserves 89 bytes for storing the filename of the configfile from memory address 0x8217 to 0x826f. We allow overwriting the default value (/boot/grub/menu.lst) when grubcfg=<filename> is used together with grub=<loader>. Examples: chain.c32 fs grub=/boot/grub/stage2 grubcfg=/boot/grub/grub.lst chain.c32 hd1,10 grub=/boot/grub/stage2 grubcfg=/boot/grub/grub.lst Use a structure instead of hard-coded offsets for modifying the install_partition variable (and the configfile name) in the stage2 file. Add some comments about the "boot information format" of the Multiboot specification, which is very similar to the install_partition variable used by GRUB Legacy. Signed-off-by: Gert Hulselmans <gerth@zytor.com>
* | | ifcpu.c32: need <unistd.h>H. Peter Anvin2010-07-051-0/+1
| | | | | | | | | | | | Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | ifcpu.c32: remove open-coded sleep functionH. Peter Anvin2010-07-051-13/+1
| | | | | | | | | | | | | | | | | | Remove open-coded sleep function, which uses an unreliable BIOS call. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | lua: change syslinux.sleep() to seconds, syslinux.msleep() to msH. Peter Anvin2010-07-053-11/+24
| | | | | | | | | | | | | | | | | | | | | For consistency with just about everything else, make syslinux.sleep() count seconds, and syslinux.msleep() count milliseconds. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | com32: add proper sleep()/msleep() functions and make Lua use themH. Peter Anvin2010-07-057-19/+30
| | | | | | | | | | | | | | | | | | | | | Add proper sleep() and msleep() functions, which among other things call syslinux_idle(), and make Lua use them. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | com32: change clock_t to 32 bits, and in millisecondsH. Peter Anvin2010-07-052-7/+5
| | | | | | | | | | | | | | | | | | | | | Previously, clock_t was 16 bits and counted timer ticks, now make it 32 bits and count milliseconds. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | core: add a ms-denominated timerH. Peter Anvin2010-07-054-3/+25
| |/ |/| | | | | | | | | | | | | | | Add a timer denominated in milliseconds. This is still driven by the 18.2 Hz timer interrupt, but counts "real" milliseconds, including handing the adjustment factor (which in reality means it advances by 55 for most timer ticks and 54 for some.) Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | Merge remote branch 'marcel/luaext'H. Peter Anvin2010-07-059-11/+1116
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Marcel Ritter's work on the lua branch: The last time he wrote about the state of his lua branch: http://syslinux.zytor.com/archives/2009-October/013383.html The current state is: - VESA: - switching to vesa mode works - loading/displaying images works - display text works (s. com32/lua/test/vesa.lua) - PCI: - list PC devices + ID - get human-readable device name for device (s. com32/lua/test/pci.lua) - DMI: - get DMI info (BIOS, Hardware, etc). (s. com32/lua/test/dmi.lua) - syslinux: - loading files, kernel, initrd - start kernel, initrd, local boot ... just working on this, so no example lua file right now Most of the actual merging work was done by Gert Hulselmans <gerth@zytor.com>. Resolved Conflicts: com32/lib/sys/vesa/initvesa.c com32/lua/src/Makefile Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| * | Added PCI descMarcel Ritter2009-10-201-1/+43
| | |
| * | Added invocationMarcel Ritter2009-10-201-0/+15
| | |
| * | NewMarcel Ritter2009-10-201-0/+216
| | |
| * | Loading of kernel and ramdisk worksMarcel Ritter2009-10-161-0/+120
| | |
| * | More debugging removedMarcel Ritter2009-10-151-0/+2
| | |
| * | Disabled debug outputMarcel Ritter2009-10-151-3/+4
| | |
| * | UpdatedMarcel Ritter2009-10-121-0/+44
| | |
| * | Fixed vesa stuffMarcel Ritter2009-10-103-2/+23
| | |
| * | Added sleep()Marcel Ritter2009-10-092-39/+92
| | | | | | | | | | | | | | | Added some comments Fixed cmdline parsing
| * | Prepare for arg parsing supportMarcel Ritter2009-10-091-1/+229
| | |
| * | COM32: lua - add vesa functions (only mode listing right now)Marcel Ritter2008-12-155-0/+144
| | |
| * | COM32: lua - basic pci functions implementedMarcel Ritter2008-12-155-1/+224
| | |
* | | zlib: update to zlib 1.2.5H. Peter Anvin2010-07-0522-1254/+2712
| | | | | | | | | | | | | | | | | | Update zlib to zlib 1.2.5. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | libpng: upgrade to version 1.2.44H. Peter Anvin2010-07-0432-18460/+10183
| | | | | | | | | | | | | | | | | | Upgrade libpng from 1.2.8 to 1.2.44. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | com32: update getopt() to the current version from klibcH. Peter Anvin2010-07-021-46/+71
| | | | | | | | | | | | | | | | | | Update getopt() to the current klibc version. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | com32: add getopt_long() to the libraryH. Peter Anvin2010-07-023-1/+176
| | | | | | | | | | | | | | | | | | | | | Add getopt_long() to the library. This is code lifted straight out of klibc. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | NEWS, version: now working on version 4.02H. Peter Anvin2010-07-022-1/+11
| | | | | | | | | | | | Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | core: split loadconfig.c into two filesH. Peter Anvin2010-07-022-29/+41
| | | | | | | | | | | | | | | | | | | | | Split loadconfig.c into two files. In particular, isolinux needs search_config() but not generic_load_config(). Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | core: merge the configfile-searching code, isolinux generic namesH. Peter Anvin2010-07-023-42/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the config file searching code between syslinux and isolinux, and make isolinux also recognize the generic names "syslinux" and "syslinux.cfg". Thus, isolinux now searches for configuration files in the following order: /boot/isolinux/isolinux.cfg /boot/isolinux/syslinux.cfg /isolinux/isolinux.cfg /isolinux/syslinux.cfg /boot/syslinux/isolinux.cfg /boot/syslinux/syslinux.cfg /syslinux/isolinux.cfg /syslinux/syslinux.cfg /isolinux.cfg /syslinux.cfg Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | core: always canonicalize the configuration file nameH. Peter Anvin2010-07-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The FAT installers may not produce a canonical pathname in the CurrentDirName field on entry. Make sure that the core doesn't croak when that happens, and still produces an absolute pathname for the configuration file. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | lua: quiet warnings about unused variables and functionsH. Peter Anvin2010-07-023-2/+5
| | | | | | | | | | | | | | | | | | | | | Quiet gcc warnings about unused variables and functions -- things that are not used in the Syslinux environment at this time. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | lua: add parents to luaconf.h to quiet a gcc warningH. Peter Anvin2010-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | gcc warns about suspicious-looking code with a comparison inside ==. The code is correct, but add parens so that gcc know we know it is correct. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | lua: add missing <syslinux/boot.h> to syslinux.cH. Peter Anvin2010-07-021-0/+1
| | | | | | | | | | | | | | | | | | Need header files for functions we invoke. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | lua: Modernize the MakefileH. Peter Anvin2010-07-021-73/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modernize the Makefile for lua to match the current style, in particular to have it pick up its configuration and rules from the central MCONFIG file. This also fixes the incorrect use of "clean" vs. "spotless" which was picked up from the Makefile style in use at that time. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | NEWS: explain the memory overwrite bug a bit betterH. Peter Anvin2010-07-021-2/+2
| | | | | | | | | | | | Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | Fix nuisance _FORTIFY_SOURCE failuresH. Peter Anvin2010-07-022-3/+7
| | | | | | | | | | | | | | | | | | | | | Fix a couple of _FORTIFY_SOURCE failures which are nuisance warnings, but fortunately not too hard to just plain avoid. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | installers: handle asprintf() correctlyH. Peter Anvin2010-07-023-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that the glibc version of asprintf() is braindamaged, and doesn't set the target pointer to NULL in the event of an error (only returns -1). Therefore we need to check the return value. Just in case someone else made the *opposite* error, also check the pointer. Bleh. The glibc documentation states that *BSD sets the pointer to NULL, but instead of following that, the glibc people put warn_unused_result on asprintf. Sigh. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | Document 'nopassany' in MEMDISK documentation.Gert Hulselmans2010-07-021-0/+1
| | | | | | | | | | | | | | | 'nopassany' is missing in the MEMDISK documentation: http://www.zytor.com/pipermail/syslinux-commits/2010-February/000096.html
* | | pxelinux: new IPAPPEND 4 to generate a SYSUUID= option.H. Peter Anvin2010-07-017-25/+72
| | | | | | | | | | | | | | | | | | | | | Add a new IPAPPEND option to generate a SYSUUID= option with the in-system UUID. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
* | | Makefile: add lua.c32 to installablesH. Peter Anvin2010-07-011-1/+1
| | | | | | | | | | | | | | | | | | lua.c32 is an installable file. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | core, diskio: reset controller between EDD retriesH. Peter Anvin2010-07-011-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | As documented in the old assembly code, reset the disk controller between retries when using EDD. We don't want to do that for CHS, since a reset shuts down the floppy motor, and we might be suffering a timeout. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
* | | Merge branch 'lua'H. Peter Anvin2010-07-01110-1/+28956
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolved Conflicts: NEWS Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| * | | NEWS: add lua.c32H. Peter Anvin2010-07-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| * | | lua: update for Syslinux 4Geert Stappers2010-07-012-6/+16
| | | | | | | | | | | | | | | | Update the lua code to work with Syslinux 4.
| * | | Merge branch 'master' into luaH. Peter Anvin2010-07-011726-80866/+204145
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Resolved Conflicts: com32/Makefile Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| * | | COM32: lua - added dmi functionsMarcel Ritter2008-12-155-1/+324
| | | |