Gene Cumm [Fri, 2 Jul 2010 01:57:45 +0000 (21:57 -0400)]
rosh: more: if it's the first line, dump it to screen for now even if it's too long
Gene Cumm [Fri, 2 Jul 2010 01:50:16 +0000 (21:50 -0400)]
rosh: fix displaying too many lines because a line is too long.
Gene Cumm [Fri, 2 Jul 2010 01:49:36 +0000 (21:49 -0400)]
rosh: fix the DATE macro stuff
Gene Cumm [Wed, 7 Jul 2010 13:52:59 +0000 (09:52 -0400)]
rosh: begin to add Syslinux version string with DATE
Was from commit
226224fdd1dff5cfcac641c1405303932b59aa4f; This is incomplete but will be fixed in the next commit
H. Peter Anvin [Tue, 6 Jul 2010 21:16:15 +0000 (14:16 -0700)]
zlib: rename DEBUG to DEBUG_ZLIB again
We don't want to use the global DEBUG for zlib...
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Tue, 6 Jul 2010 01:16:02 +0000 (18:16 -0700)]
mtools: slightly more obvious definition of tmpdir fallback
Make it a bit more obvious what actually happens for the tmpdir
fallback.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Tue, 6 Jul 2010 01:12:29 +0000 (18:12 -0700)]
mtools: honor TMPDIR, check for errors writing mtools.conf
Honor TMPDIR when picking a place to write mtools.conf.
Check for errors while writing mtools.conf.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Tue, 6 Jul 2010 00:50:13 +0000 (17:50 -0700)]
btrfs: print an error if finding compressed/encrypted data
If we find compressed or encrypted data, print an error message
instead of returning garbage. This is suboptimal, but at least
handles the common subcase of an encrypted configuration file.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Tue, 6 Jul 2010 00:43:51 +0000 (17:43 -0700)]
Merge remote branch 'gerth/ifcpu_remove_defines'
Gert Hulselmans [Mon, 5 Jul 2010 23:59:40 +0000 (01:59 +0200)]
ifcpu.c32: Remove defines used in the old sleep function.
Remove useless defines which where used in the old sleep function.
Signed-off-by: Gert Hulselmans <gerth@zytor.com>
Gert Hulselmans [Mon, 5 Jul 2010 23:43:29 +0000 (01:43 +0200)]
NEWS: add grubcfg= and whichsys.c32
Add grubcfg= and whichsys.c32 to the NEWS file.
Gert Hulselmans [Mon, 5 Jul 2010 23:38:29 +0000 (01:38 +0200)]
NEWS: add grubcfg= and whichsys.c32
Add grubcfg= and whichsys.c32 to the NEWS file.
H. Peter Anvin [Mon, 5 Jul 2010 23:05:50 +0000 (16:05 -0700)]
Merge remote branch 'gerth/whichsys'
H. Peter Anvin [Mon, 5 Jul 2010 23:05:44 +0000 (16:05 -0700)]
Merge remote branch 'gerth/chain_grubcfg'
H. Peter Anvin [Mon, 5 Jul 2010 22:59:36 +0000 (15:59 -0700)]
ifcpu.c32: need <unistd.h>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Mon, 5 Jul 2010 22:58:45 +0000 (15:58 -0700)]
ifcpu.c32: remove open-coded sleep function
Remove open-coded sleep function, which uses an unreliable BIOS call.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Mon, 5 Jul 2010 22:52:07 +0000 (15:52 -0700)]
lua: change syslinux.sleep() to seconds, syslinux.msleep() to ms
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>
H. Peter Anvin [Mon, 5 Jul 2010 22:45:37 +0000 (15:45 -0700)]
com32: add proper sleep()/msleep() functions and make Lua use them
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>
H. Peter Anvin [Mon, 5 Jul 2010 22:43:09 +0000 (15:43 -0700)]
com32: change clock_t to 32 bits, and in milliseconds
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>
H. Peter Anvin [Mon, 5 Jul 2010 22:41:36 +0000 (15:41 -0700)]
core: add a ms-denominated timer
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>
Gert Hulselmans [Mon, 5 Jul 2010 21:52:39 +0000 (23:52 +0200)]
whichsys.c32: execute specific command, based on Syslinux bootloader variant
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>
H. Peter Anvin [Mon, 5 Jul 2010 21:23:50 +0000 (14:23 -0700)]
Merge remote branch 'marcel/luaext'
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>
H. Peter Anvin [Mon, 5 Jul 2010 20:41:04 +0000 (13:41 -0700)]
zlib: update to zlib 1.2.5
Update zlib to zlib 1.2.5.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Gert Hulselmans [Mon, 5 Jul 2010 12:04:46 +0000 (14:04 +0200)]
chain.c32: Put declaration of *stage2 before common code
Put declaration of *stage2 before common code.
Signed-off-by: Gert Hulselmans <gerth@zytor.com>
H. Peter Anvin [Mon, 5 Jul 2010 05:29:42 +0000 (22:29 -0700)]
libpng: upgrade to version 1.2.44
Upgrade libpng from 1.2.8 to 1.2.44.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Gert Hulselmans [Sun, 4 Jul 2010 18:35:15 +0000 (20:35 +0200)]
chain.c32: add grubcfg= for passing an alternative config filename to GRUB 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>
H. Peter Anvin [Sat, 3 Jul 2010 01:00:42 +0000 (18:00 -0700)]
com32: update getopt() to the current version from klibc
Update getopt() to the current klibc version.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sat, 3 Jul 2010 00:57:17 +0000 (17:57 -0700)]
com32: add getopt_long() to the library
Add getopt_long() to the library. This is code lifted straight out of
klibc.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Fri, 2 Jul 2010 23:48:24 +0000 (16:48 -0700)]
NEWS, version: now working on version 4.02
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 2 Jul 2010 23:19:59 +0000 (16:19 -0700)]
core: split loadconfig.c into two files
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>
H. Peter Anvin [Fri, 2 Jul 2010 23:13:44 +0000 (16:13 -0700)]
core: merge the configfile-searching code, isolinux generic names
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>
H. Peter Anvin [Fri, 2 Jul 2010 23:01:19 +0000 (16:01 -0700)]
core: always canonicalize the configuration file name
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>
H. Peter Anvin [Fri, 2 Jul 2010 18:19:39 +0000 (11:19 -0700)]
lua: quiet warnings about unused variables and functions
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>
H. Peter Anvin [Fri, 2 Jul 2010 18:18:57 +0000 (11:18 -0700)]
lua: add parents to luaconf.h to quiet a gcc warning
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>
H. Peter Anvin [Fri, 2 Jul 2010 18:18:24 +0000 (11:18 -0700)]
lua: add missing <syslinux/boot.h> to syslinux.c
Need header files for functions we invoke.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 2 Jul 2010 18:16:40 +0000 (11:16 -0700)]
lua: Modernize the Makefile
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>
H. Peter Anvin [Fri, 2 Jul 2010 18:00:51 +0000 (11:00 -0700)]
NEWS: explain the memory overwrite bug a bit better
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Fri, 2 Jul 2010 16:49:45 +0000 (09:49 -0700)]
Fix nuisance _FORTIFY_SOURCE failures
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>
H. Peter Anvin [Fri, 2 Jul 2010 16:39:18 +0000 (09:39 -0700)]
installers: handle asprintf() correctly
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>
Gert Hulselmans [Sat, 6 Mar 2010 21:56:41 +0000 (13:56 -0800)]
Document 'nopassany' in MEMDISK documentation.
'nopassany' is missing in the MEMDISK documentation:
http://www.zytor.com/pipermail/syslinux-commits/2010-February/000096.html
H. Peter Anvin [Fri, 2 Jul 2010 02:44:53 +0000 (19:44 -0700)]
pxelinux: new IPAPPEND 4 to generate a SYSUUID= option.
Add a new IPAPPEND option to generate a SYSUUID= option with the
in-system UUID.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Fri, 2 Jul 2010 01:12:41 +0000 (18:12 -0700)]
Makefile: add lua.c32 to installables
lua.c32 is an installable file.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 2 Jul 2010 01:10:22 +0000 (18:10 -0700)]
core, diskio: reset controller between EDD retries
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>
H. Peter Anvin [Fri, 2 Jul 2010 01:08:24 +0000 (18:08 -0700)]
Merge branch 'lua'
Resolved Conflicts:
NEWS
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 2 Jul 2010 01:05:57 +0000 (18:05 -0700)]
NEWS: document memory overwrite fix
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 2 Jul 2010 01:04:13 +0000 (18:04 -0700)]
com32: canonicalize DEBUG to mean <dprintf.h>
Remove historical uses of DEBUG/dprintf in favor of the centralized
<dprintf.h>.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 2 Jul 2010 01:03:01 +0000 (18:03 -0700)]
zlib: change DEBUG to DEBUG_ZLIB
zlib uses DEBUG for something slightly different than the Syslinux
main code, so change the name of the symbol.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 2 Jul 2010 01:02:11 +0000 (18:02 -0700)]
dprintf: allow overriding the serial port address
Allow overriding the serial port address, e.g. for systems which only
have PCI serial ports.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Fri, 2 Jul 2010 00:59:30 +0000 (17:59 -0700)]
comboot.inc: vk_append is a field in a struct, not an address
We want to use VKernelBuf as temporary storage, not vk_append.
vk_append is an offset into a larger buffer, and we ended up
corrupting low BIOS memory.
Reported-by: Joseph Cihula <joseph.cihula@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Thu, 1 Jul 2010 21:29:42 +0000 (14:29 -0700)]
NEWS: add lua.c32
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Geert Stappers [Thu, 1 Jul 2010 19:14:38 +0000 (21:14 +0200)]
lua: update for Syslinux 4
Update the lua code to work with Syslinux 4.
H. Peter Anvin [Thu, 1 Jul 2010 21:26:36 +0000 (14:26 -0700)]
Merge branch 'master' into lua
Resolved Conflicts:
com32/Makefile
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Thu, 1 Jul 2010 21:21:14 +0000 (14:21 -0700)]
MCONFIG: add -Wno-error to .lnx files
Again, .lnx files are test vehicles... erroring out due to warnings
makes no sense.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Thu, 1 Jul 2010 21:15:38 +0000 (14:15 -0700)]
MCONFIG: .lnx files are for testing, don't do _FORTIFY_SOURCE
.lnx files are strictly a testing vehicle. It makes absolutely no
sense to enforce the often rather arbitrary rules of _FORTIFY_SOURCE
on those, so override the default _FORTIFY_SOURCE setting.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Gert Hulselmans [Thu, 1 Jul 2010 15:57:44 +0000 (17:57 +0200)]
ifplop.c32: Detect if PLoP USB/CD INT13h hook is enabled/disabled
New module which detects if the PLoP Boot Loader already has booted a
CDROM or USB drive by checking for the presence of the PLoP INT13h hook.
The following assembly code (NASM) can detect the PLoP INT13h hook:
mov eax,'PoLP' ; Reverse of 'PLoP'
mov ebp,'DKHC' ; Reverse of 'CHKD'
int 13h
cmp eax,' sey' ; Reverse of 'yes '
jz plop_INT13h_active
Signed-off-by: Gert Hulselmans <gerth@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Thu, 1 Jul 2010 19:47:02 +0000 (12:47 -0700)]
Merge branch 'master' of ssh://terminus.zytor.com/pub/git/syslinux/syslinux
H. Peter Anvin [Thu, 1 Jul 2010 14:22:30 +0000 (07:22 -0700)]
NEWS: document changes to the CD-ROM initialization sequence
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 30 Jun 2010 21:02:56 +0000 (14:02 -0700)]
core, diskio: skip EDD/CHS detect for CD-ROMs
Skip EDD and CHS detection if we know it is a CD-ROM, because some
CD-ROMs possibly report bad information, and/or screw up the stack,
possibly permanently.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Thu, 1 Jul 2010 14:19:23 +0000 (07:19 -0700)]
core, diskio: move dprintfs to the intended location
Move the dprintfs to the location that they were intended to use.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 30 Jun 2010 16:53:46 +0000 (09:53 -0700)]
core, diskio: put the error code in dprintf and printable messages
When we print an error message to the screen, include the error
number. Furthermore, dprintf it on retries.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 30 Jun 2010 00:45:23 +0000 (17:45 -0700)]
mboot.h: use <dprintf.h>
Use <dprintf.h> like more and more of the system does...
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Wed, 30 Jun 2010 00:21:43 +0000 (17:21 -0700)]
NEWS: beginning of a 4.01 NEWS file
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Wed, 30 Jun 2010 00:17:58 +0000 (17:17 -0700)]
diskstart: don't let the function number clobber the LBA
The LBA for getonesec and getlinsec is in EDX:EAX, but both DL and AX
are function inputs to INT 13h (drive number and function number). We
need to preserve the LBA across *both* those, otherwise retries will
not function.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Tue, 29 Jun 2010 22:17:11 +0000 (15:17 -0700)]
isolinux: don't clobber DX (DL!) on startup
DL contains the initial drive number, don't clobber it!
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Tue, 29 Jun 2010 20:27:03 +0000 (13:27 -0700)]
isolinux: make sure Hidden is zero in native El Torito mode
In native El Torito mode, there is no such thing as a partition
offset. Make sure that we set Hidden to zero -- we don't use Hidden
(yet, although the ebios and cdrom code should be merged!) but we pass
it to the PM code, which will produce *really* wrong results...
Reported-by: Helmut Hullen <Hullen@t-online.de>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Tue, 29 Jun 2010 17:36:28 +0000 (10:36 -0700)]
core, diskio: add a few dprintf()'s
Add a handful of dprintf's to make it easier to debug disk I/O
failures.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 28 Jun 2010 22:59:25 +0000 (15:59 -0700)]
version: next version in 4.01
4.00 is out, start work on 4.01...
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 28 Jun 2010 22:56:43 +0000 (15:56 -0700)]
Merge remote branch 'debian/daniel'
H. Peter Anvin [Mon, 28 Jun 2010 21:42:11 +0000 (14:42 -0700)]
Merge remote branch 'sha0/newness'
Shao Miller [Mon, 28 Jun 2010 21:41:21 +0000 (14:41 -0700)]
NEWS: Document mdiskchk.com and eltorito.sys changes
H. Peter Anvin [Mon, 28 Jun 2010 21:37:45 +0000 (14:37 -0700)]
config.c32: accept an optional new directory
Accept an optional new directory to config.c32, just as we permit for
the CONFIG statement.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 28 Jun 2010 21:34:08 +0000 (14:34 -0700)]
diskio: hard-code CD-ROM sectors to 2048 bytes
At least the ThinkPad T22 and T23 will incorrectly report a sector
size of 512 bytes for El Torito CD-ROMs. Ignore the reported sector
size for El Torito boots.
Reported-by: Helmut Hullen <hullen@t-online.de>
Tested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 28 Jun 2010 20:51:15 +0000 (13:51 -0700)]
NEWS: document MENU IMMEDIATE
H. Peter Anvin [Mon, 28 Jun 2010 20:48:21 +0000 (13:48 -0700)]
NEWS: document isohybrid.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 28 Jun 2010 20:47:37 +0000 (13:47 -0700)]
NEWS: document ifcpu*.c32 fix
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Erwan Velu [Mon, 28 Jun 2010 19:39:04 +0000 (21:39 +0200)]
NEWS: Fixing HDT, adding ifcpu changes
H. Peter Anvin [Mon, 28 Jun 2010 19:24:28 +0000 (12:24 -0700)]
NEWS: first cut of a NEWS file for 4.00
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 28 Jun 2010 01:46:36 +0000 (18:46 -0700)]
core, chdir: collapse slashes, avoid copy-to-self
Collapse multiple slashes into one (this still doesn't resolve . and
.. in the path, since that requires awareness of symlinks.)
This code also avoids a copy-over-self bug by introducing a temporary
buffer.
Reported-by: Gene Cumm <gene.cumm@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Mon, 28 Jun 2010 01:29:02 +0000 (18:29 -0700)]
Merge remote branch 'sha0/gert_chain'
Gert Hulselmans [Mon, 28 Jun 2010 01:11:48 +0000 (03:11 +0200)]
chain.c32: pass partition number to stage2 of Grub Legacy
Grub Legacy stage2 will read the install_partition variable from
memory address 0x8208.
We only need to change the value at 0x820a to the correct partition
number:
-1: whole drive (default)
0-3: primary partitions
4-*: logical partitions
Signed-off-by: Gert Hulselmans <gerth@zytor.com>
Gene Cumm [Mon, 28 Jun 2010 01:09:23 +0000 (18:09 -0700)]
rosh: update for Syslinux 4 and make it more usable
Without further adieu, I would like to announce that I've finally
pushed ROSH, the Read-Only SHell, finally to the point of being
reasonably usable.
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Gert Hulselmans [Mon, 28 Jun 2010 00:42:58 +0000 (02:42 +0200)]
chain.c32: only pass partition number in DH, when grldr= is used
Add grldr= as boot parameter, so the partition number is only passed to
grub4dos grldr, when grldr= is used.
Currently the partition number is passed in DH unconditionally.
As consequence, grldr will set its root partition on which is searches its
menu.lst to (hd0), because -1 (whole drive) is passed in DH as root partition:
chain.c32 file=/grldr
When the conditional check, this problem is solved:
chain.c32 file=/grldr
Grub4dos will search all partitions for its menu.lst
When you want to set the root partition, use something like the following:
chain.c32 hd0,2 grldr=/grldr
chain.c32 fs grldr=/grldr
Signed-off-by: Gert Hulselmans <gerth@zytor.com>
H. Peter Anvin [Mon, 28 Jun 2010 00:48:58 +0000 (17:48 -0700)]
Merge remote branch 'sha0/gert_chain'
Gert Hulselmans [Mon, 28 Jun 2010 00:13:39 +0000 (02:13 +0200)]
chain.c32: add keeppxe to usage output and cleanup comments
Add keeppxe to usage output.
Cleanup some comments.
H. Peter Anvin [Mon, 28 Jun 2010 00:09:18 +0000 (17:09 -0700)]
<linux/loop.h>: deal with really ancient Linux kernel headers
RHEL4 had a 2.6.9 kernel, but 2.4.20 Linux kernel headers, so put in a
workaround for 2.4 kernel headers.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 23:38:25 +0000 (16:38 -0700)]
libinstaller: include <linux/loop.h>
Some versions of glibc have broken versions of <linux/loop.h>, so
include our own canned version.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 19:02:48 +0000 (12:02 -0700)]
Export the 64-bit partition offset and use it in chain.c
When used with the "fs" option to chain.c32, we need to know our own
filesystem offset. That means knowing if we used the MBR vs GPT
partition information, as well as if we ended up using the passed-in
information or not.
Resolve this by providing an explicit pointer to the current partition
offset. Eventually this should be replaced by some kind of statfs()
call.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 18:43:49 +0000 (11:43 -0700)]
isohdpfx: update to the new !GPT protocol
Update the check for !GPT to match the updated protocol (with length).
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 04:31:08 +0000 (21:31 -0700)]
diskstart: if no partition info is available, use bsHidden
If we have no partition information available, use the bsHidden field
(which is set by the extlinux installer in the case of non-FAT). This
gives at least a hope of working correctly (for < 2 TiB disks, at
least) with the stock Vista/Win7 MBR.
Also, add a check for partition type != 0. This helps catch the case
when DS:SI points into all-zero memory.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 04:24:02 +0000 (21:24 -0700)]
Update .gitignore
H. Peter Anvin [Sun, 27 Jun 2010 04:22:48 +0000 (21:22 -0700)]
extlinux: set bsHidden for loop devices
If we are on a loop device, set bsHidden based on the loopback device
offset.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Gene Cumm [Sun, 27 Jun 2010 02:51:39 +0000 (22:51 -0400)]
PM getcwd(); Fix COM32 getcwd
Implement getcwd() in the core; Fix COM32 getcwd() to use the new function.
This resolves the previous comment about COM32 getcwd() not working by
not using INT 22h AX=001Fh.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 03:38:04 +0000 (20:38 -0700)]
core: move PartInfo back to the top of stack
Move PartInfo back to near the top of the stack. This makes it less
likely that it ends up getting overwritten during the act of copying
itself.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 03:37:37 +0000 (20:37 -0700)]
syslinux.ld: remove redundant definition of STACK32_LEN
STACK32_LEN is already defined in layout.inc.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 03:28:45 +0000 (20:28 -0700)]
menu: add MENU HELP
Add a feature to display fullscreen help via menu selection entry
(inspired by the Debian install disc menus.)
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 01:46:33 +0000 (18:46 -0700)]
core, fs: eliminate recursion in put_inode()
We don't actually need recursion in put_inode(), so replace recursion
with a loop.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 01:07:59 +0000 (18:07 -0700)]
chain.c32: fix handover to a logical partition
Make sure the handover information to a logical partition is adjusted
correctly -- we can't just hand over the partition entry, but we have
to adjust start_lba to match the real start LBA.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 27 Jun 2010 00:49:01 +0000 (17:49 -0700)]
gptmbr: skip partitions with all-zero PartitionTypeGUID
PartitionTypeGUID being zero means an empty slot, and so we should not
count that partition type.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sat, 26 Jun 2010 22:03:02 +0000 (15:03 -0700)]
pwd.c32: add to Makefile
Actually *build* pwd.c32...
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sat, 26 Jun 2010 21:57:14 +0000 (14:57 -0700)]
chain.c32: "fs" is a singular token, only match if complete
fs is a full token, not a prefix.
Reported-by: Gert Hulselmans <gerth@zytor.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>