platform/upstream/syslinux.git
14 years agocore, diskio: move dprintfs to the intended location
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>
14 years agocore, diskio: put the error code in dprintf and printable messages
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>
14 years agoNEWS: beginning of a 4.01 NEWS file
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>
14 years agodiskstart: don't let the function number clobber the LBA
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>
14 years agoisolinux: don't clobber DX (DL!) on startup
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>
14 years agoisolinux: make sure Hidden is zero in native El Torito mode
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>
14 years agocore, diskio: add a few dprintf()'s
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>
14 years agoversion: next version in 4.01
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>
14 years agoMerge remote branch 'debian/daniel'
H. Peter Anvin [Mon, 28 Jun 2010 22:56:43 +0000 (15:56 -0700)]
Merge remote branch 'debian/daniel'

14 years agoMerge remote branch 'sha0/newness' syslinux-4.00
H. Peter Anvin [Mon, 28 Jun 2010 21:42:11 +0000 (14:42 -0700)]
Merge remote branch 'sha0/newness'

14 years agoNEWS: Document mdiskchk.com and eltorito.sys changes
Shao Miller [Mon, 28 Jun 2010 21:41:21 +0000 (14:41 -0700)]
NEWS: Document mdiskchk.com and eltorito.sys changes

14 years agoconfig.c32: accept an optional new directory
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>
14 years agodiskio: hard-code CD-ROM sectors to 2048 bytes
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>
14 years agoNEWS: document MENU IMMEDIATE
H. Peter Anvin [Mon, 28 Jun 2010 20:51:15 +0000 (13:51 -0700)]
NEWS: document MENU IMMEDIATE

14 years agoNEWS: document isohybrid.c
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>
14 years agoNEWS: document ifcpu*.c32 fix
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>
14 years agoNEWS: Fixing HDT, adding ifcpu changes
Erwan Velu [Mon, 28 Jun 2010 19:39:04 +0000 (21:39 +0200)]
NEWS: Fixing HDT, adding ifcpu changes

14 years agoNEWS: first cut of a NEWS file for 4.00
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>
14 years agocore, chdir: collapse slashes, avoid copy-to-self syslinux-4.00-pre64
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>
14 years agoMerge remote branch 'sha0/gert_chain'
H. Peter Anvin [Mon, 28 Jun 2010 01:29:02 +0000 (18:29 -0700)]
Merge remote branch 'sha0/gert_chain'

14 years agochain.c32: pass partition number to stage2 of Grub Legacy
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>
14 years agorosh: update for Syslinux 4 and make it more usable
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>
14 years agochain.c32: only pass partition number in DH, when grldr= is used
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>
14 years agoMerge remote branch 'sha0/gert_chain'
H. Peter Anvin [Mon, 28 Jun 2010 00:48:58 +0000 (17:48 -0700)]
Merge remote branch 'sha0/gert_chain'

14 years agochain.c32: add keeppxe to usage output and cleanup comments
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.

14 years ago<linux/loop.h>: deal with really ancient Linux kernel headers
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>
14 years agolibinstaller: include <linux/loop.h>
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>
14 years agoExport the 64-bit partition offset and use it in chain.c
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>
14 years agoisohdpfx: update to the new !GPT protocol
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>
14 years agodiskstart: if no partition info is available, use bsHidden syslinux-4.00-pre63
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>
14 years agoUpdate .gitignore
H. Peter Anvin [Sun, 27 Jun 2010 04:24:02 +0000 (21:24 -0700)]
Update .gitignore

14 years agoextlinux: set bsHidden for loop devices
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>
14 years agoPM getcwd(); Fix COM32 getcwd
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>
14 years agocore: move PartInfo back to the top of stack
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>
14 years agosyslinux.ld: remove redundant definition of STACK32_LEN
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>
14 years agomenu: add MENU HELP
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>
14 years agocore, fs: eliminate recursion in put_inode()
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>
14 years agochain.c32: fix handover to a logical partition
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>
14 years agogptmbr: skip partitions with all-zero PartitionTypeGUID
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>
14 years agopwd.c32: add to Makefile
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>
14 years agochain.c32: "fs" is a singular token, only match if complete
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>
14 years agocom32 pwd module
Gene Cumm [Sat, 26 Jun 2010 14:59:46 +0000 (10:59 -0400)]
com32 pwd module

[MODULE] pwd to list present (current) working directory.  If the
returned string is empty, display ".".  If the return value is NULL,
display an error message.

Unfortunately, it appears that COM32 getcwd is not working properly at
this moment, it calling the COMBOOT call and getting an empty string.

Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agoFix COM32 chdir()
Gene Cumm [Sat, 26 Jun 2010 15:18:59 +0000 (11:18 -0400)]
Fix COM32 chdir()

Fix COM32 chdir() since it's implemented in the core.
Forgot the core changes needed for this before.

Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agopmapi: make the pmapi vector include its own size
H. Peter Anvin [Sat, 26 Jun 2010 19:30:13 +0000 (12:30 -0700)]
pmapi: make the pmapi vector include its own size

Future-proof the pmapi vector by making it include its own size.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agochain: Support booting GPT partition by label
Shao Miller [Sat, 26 Jun 2010 06:19:04 +0000 (02:19 -0400)]
chain: Support booting GPT partition by label

Use the "label:" specifier followed by the label for
one of a GPT disk's partitions.

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agochain: Support booting GPT disk/partition by GUID
Shao Miller [Sat, 26 Jun 2010 04:29:39 +0000 (00:29 -0400)]
chain: Support booting GPT disk/partition by GUID

Use the "guid:" specifier followed by the GUID for
a GPT disk or one of its partitions.

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agocore, fs: handle .. resolution in the filesystem core
H. Peter Anvin [Sat, 26 Jun 2010 03:36:59 +0000 (20:36 -0700)]
core, fs: handle .. resolution in the filesystem core

Some filesystems, including btrfs, don't have .. directory entries.
We already handle . in the filesystem core, handle .. as well.

This means keeping chains of parent inodes for all open inodes, at
least for the duration of a path search; we might as well hang onto
them.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agobtrfs: initialize the block cache early
H. Peter Anvin [Sat, 26 Jun 2010 03:34:26 +0000 (20:34 -0700)]
btrfs: initialize the block cache early

Initialize the block cache at the very start.  The block size for
btrfs is fixed, and so we can start by initializing the cache.  That
eliminates a whole bunch of unnecessary I/O as well as extra code.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agobtrfs: do not read past the end of the disk
H. Peter Anvin [Sat, 26 Jun 2010 03:10:09 +0000 (20:10 -0700)]
btrfs: do not read past the end of the disk

When looking for the current superblock, don't read past the end of
the disk.  This more or less assumes that the superblocks are
reasonably consistent with regards to the total filesystem size.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agocore, diskio: make error messages a little more useful
H. Peter Anvin [Sat, 26 Jun 2010 02:51:14 +0000 (19:51 -0700)]
core, diskio: make error messages a little more useful

Be a bit more explicit about the particular errors we see.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agoextlinux: modify the layout for btrfs
H. Peter Anvin [Sat, 26 Jun 2010 02:49:20 +0000 (19:49 -0700)]
extlinux: modify the layout for btrfs

Put the btrfs boot code right after the boot sector (they are really
one image anyway).  Align the ADV with the end of the boot region, so
we can locate it for modification as necessary, and the offset don't
end up shifting with different boot image sizes.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agodos: include the ADV in the file size to be sector mapped syslinux-4.00-pre62
H. Peter Anvin [Fri, 25 Jun 2010 22:25:22 +0000 (15:25 -0700)]
dos: include the ADV in the file size to be sector mapped

We need to include the ADV in the size of the file that must be sector
mapped.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agomtools: include the size of the ADV in the mappable range
H. Peter Anvin [Fri, 25 Jun 2010 22:23:42 +0000 (15:23 -0700)]
mtools: include the size of the ADV in the mappable range

We need to include the size of the ADV in the range of data that needs
to be mapped.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agochain.c32: correctly set the length of the GPT handover structure syslinux-4.00-pre61
H. Peter Anvin [Fri, 25 Jun 2010 20:56:19 +0000 (13:56 -0700)]
chain.c32: correctly set the length of the GPT handover structure

We need to make sure the entire GPT handover structure is mapped
correctly by the shuffler.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agoMerge remote branch 'sha0/chain_gpt'
H. Peter Anvin [Fri, 25 Jun 2010 20:48:49 +0000 (13:48 -0700)]
Merge remote branch 'sha0/chain_gpt'

14 years agopxe: don't corrupt the length of an RRQ packet on retry
H. Peter Anvin [Fri, 25 Jun 2010 20:13:11 +0000 (13:13 -0700)]
pxe: don't corrupt the length of an RRQ packet on retry

Due to double use of the variable "buf", we would end up corrupting
the length, but not the contents, of an RRQ packet if we ended up
having to re-send.  Some TFTP servers ignored the extra garbage
(including tftp-hpa), others would refuse to accept the RRQ, causing
failures.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agochain: Implement GPT hand-over protocol as documented
Shao Miller [Fri, 25 Jun 2010 10:45:07 +0000 (06:45 -0400)]
chain: Implement GPT hand-over protocol as documented

When a partition was yielded by a GPT partition iterator,
we follow the protocol documented in syslinux/doc/gpt.txt.

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agopxe: fix the unload sequence
H. Peter Anvin [Fri, 25 Jun 2010 04:35:44 +0000 (21:35 -0700)]
pxe: fix the unload sequence

For somewhat unclear reasons, the PXE unload sequence took the old PXE
path (pre-2.00 API).  Take the new sequence if available.  Also
improve the error message.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agopxe: fix ip_ok()
H. Peter Anvin [Fri, 25 Jun 2010 03:55:43 +0000 (20:55 -0700)]
pxe: fix ip_ok()

Make it easier to read, but fix the address for the loopback network
(127, not 255).

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agodoc/gpt.txt: this is now fully implemented
H. Peter Anvin [Fri, 25 Jun 2010 03:40:29 +0000 (20:40 -0700)]
doc/gpt.txt: this is now fully implemented

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agoUpdating description in syslinux manpage wrt/ default entries as of syslinux >= 3.85.
Daniel Baumann [Thu, 24 Jun 2010 22:15:54 +0000 (00:15 +0200)]
Updating description in syslinux manpage wrt/ default entries as of syslinux >= 3.85.

14 years agoAdding note about extlinux.conf in extlinux manpage.
Daniel Baumann [Thu, 24 Jun 2010 22:15:43 +0000 (00:15 +0200)]
Adding note about extlinux.conf in extlinux manpage.

14 years agoRename dir.c32 -> ls.c32 syslinux-4.00-pre60
H. Peter Anvin [Thu, 24 Jun 2010 22:02:29 +0000 (15:02 -0700)]
Rename dir.c32 -> ls.c32

Use the term "ls" for directory listing, like real operating systems
;)

-hpa

14 years agochain: Allow booting the Syslinux partition with "fs"
Shao Miller [Thu, 24 Jun 2010 20:49:05 +0000 (16:49 -0400)]
chain: Allow booting the Syslinux partition with "fs"

We will now accept an "fs" option which instructs us to
chain-load whatever partition we were booted from.  Not
useful for PXELINUX, for obvious reasons.  Can be used
in combination with a "file=" option, to boot something
other than Syslinux.

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agoMerge remote branch 'erwan/master_new'
H. Peter Anvin [Thu, 24 Jun 2010 20:36:54 +0000 (13:36 -0700)]
Merge remote branch 'erwan/master_new'

14 years agoifcpu: Adding PAE support
Erwan Velu [Thu, 24 Jun 2010 20:32:03 +0000 (22:32 +0200)]
ifcpu: Adding PAE support

14 years agoMerge branch 'master' of ssh://terminus.zytor.com/pub/git/syslinux/syslinux syslinux-4.00-pre59
H. Peter Anvin [Thu, 24 Jun 2010 20:30:49 +0000 (13:30 -0700)]
Merge branch 'master' of ssh://terminus.zytor.com/pub/git/syslinux/syslinux

14 years agoextlinux: fix ADV handling, so extlinux.sys -> ldlinux.sys actually works
H. Peter Anvin [Thu, 24 Jun 2010 20:08:46 +0000 (13:08 -0700)]
extlinux: fix ADV handling, so extlinux.sys -> ldlinux.sys actually works

Do the appropriate thing for various error cases, so that the
migration code actually does the right thing.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agodisklib: Add WEE bootloader detection code
Gert Hulselmans [Thu, 24 Jun 2010 20:08:21 +0000 (22:08 +0200)]
disklib: Add WEE bootloader detection code

WEE, is a bootloader based on grub4dos. It fits in the first 63 sectors of
the drive.

The first 4 bytes are:
$ hexdump -n 4 /media/Data/ubcd-new/wee-2010-06-20/wee63.mbr
0000000 5eeb 0090
0000004

Or in the format get_mbr_string wants it:
$ hexdump -C -n 4 wee63.mbr
00000000  eb 5e 90 00

Patch tested in qemu:
  qemu -boot d -cdrom hdt.iso -hda wee-2010-06-20/wee63.mbr

14 years agochain: A sprinkling of documentation
Shao Miller [Thu, 24 Jun 2010 20:05:21 +0000 (16:05 -0400)]
chain: A sprinkling of documentation

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agoadvio: make read_adv() distinguish ENOENT from other errors
H. Peter Anvin [Thu, 24 Jun 2010 20:03:35 +0000 (13:03 -0700)]
advio: make read_adv() distinguish ENOENT from other errors

Make it possible to distinguish ENOENT from other "non-fatal" errors
in read_adv(), so we can try more than one filename.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agoifcpu: printing usage if no parameter
Erwan Velu [Thu, 24 Jun 2010 20:02:29 +0000 (22:02 +0200)]
ifcpu: printing usage if no parameter

If you just call the ifcpu.32 it display the usage.

14 years agoextlinux: add code to automate extlinux.sys -> ldlinux.sys migration
H. Peter Anvin [Thu, 24 Jun 2010 19:48:26 +0000 (12:48 -0700)]
extlinux: add code to automate extlinux.sys -> ldlinux.sys migration

- Be able to modify the ADV either in extlinux.sys or ldlinux.sys
- Be able to preserve the ADV from extlinux.sys
- Remove extlinux.sys when installing ldlinux.sys

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agolibfat: formatting fix
H. Peter Anvin [Thu, 24 Jun 2010 19:48:00 +0000 (12:48 -0700)]
libfat: formatting fix

Adjust indent damage...

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agochain: Remove type-assurance macro for declarations
Shao Miller [Thu, 24 Jun 2010 18:21:30 +0000 (14:21 -0400)]
chain: Remove type-assurance macro for declarations

A coding pattern from WinVBlock leaked through whereby a
macro is used to declare functions having the same
prototype.  This makes their declarations look a little less
like a traditional declarations however, so that pattern
has been removed.

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agochain: Support GPT disks
Shao Miller [Thu, 24 Jun 2010 18:01:34 +0000 (14:01 -0400)]
chain: Support GPT disks

A GPT disk partition iterator is introduced, so
we can chain-load partitions on such a disk.

Tested-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agochain: Change disk partition iteration strategy
Shao Miller [Thu, 24 Jun 2010 15:54:30 +0000 (11:54 -0400)]
chain: Change disk partition iteration strategy

In order to support more than just MBR and EBR walking, we
introduce the abstraction of a partition iterator.  Currently
there are just the two types: MBR partition iterator and
extended partition iterator.

Tested-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agochain: Fix allocation size in read_sectors
Shao Miller [Thu, 24 Jun 2010 15:45:35 +0000 (11:45 -0400)]
chain: Fix allocation size in read_sectors

Oops.  We might allocate more than just one sector.

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agoMove modify_adv() into common code
H. Peter Anvin [Wed, 23 Jun 2010 23:31:45 +0000 (16:31 -0700)]
Move modify_adv() into common code

modify_adv() should be used by any installer which uses the common
CLI, so it should go into syslxopt.c.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agofs: enforce filetypes in open_file
H. Peter Anvin [Wed, 23 Jun 2010 19:11:49 +0000 (12:11 -0700)]
fs: enforce filetypes in open_file

Enforce that the file type in open_file is a plain file.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agoopendir: enforce the file type
H. Peter Anvin [Wed, 23 Jun 2010 19:11:21 +0000 (12:11 -0700)]
opendir: enforce the file type

Don't allow opendir() on a non-directory.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agopxe: set the file type in the inode structure
H. Peter Anvin [Wed, 23 Jun 2010 19:08:30 +0000 (12:08 -0700)]
pxe: set the file type in the inode structure

All "files" on PXE are regular files (there is no official directory
mechanism) and so, at least for now, it's all DT_REG.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agomemdiskfind: remove debugging printf
H. Peter Anvin [Wed, 23 Jun 2010 06:21:15 +0000 (23:21 -0700)]
memdiskfind: remove debugging printf

Remove accidentally checked in debugging printf.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agomemdiskfind: make sure we don't map unavailable RAM
H. Peter Anvin [Wed, 23 Jun 2010 06:19:40 +0000 (23:19 -0700)]
memdiskfind: make sure we don't map unavailable RAM

Sometimes FBM is below the reserved memory limit, which means memory
that is available to protected-mode operating systems only and which
will be claimed by the kernel and therefore be unmappable.  Read
/proc/iomem to make sure the memory range is safe to map.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
14 years agochain: Add DOS partition dumping routine for debugging
Shao Miller [Wed, 23 Jun 2010 04:23:30 +0000 (00:23 -0400)]
chain: Add DOS partition dumping routine for debugging

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agochain: Use struct mbr where applicable
Shao Miller [Wed, 23 Jun 2010 03:44:29 +0000 (23:44 -0400)]
chain: Use struct mbr where applicable

Instead of magic offsets.

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agochain: Use CHS typedef and macros
Shao Miller [Wed, 23 Jun 2010 03:34:41 +0000 (23:34 -0400)]
chain: Use CHS typedef and macros

A DOS partition table entry contains cylinder, head, sector
tuples which can be convenient to group together and extract
with convenience macros.  Currently unused.

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agochain: Allow reading more than a single sector
Shao Miller [Wed, 23 Jun 2010 03:32:26 +0000 (23:32 -0400)]
chain: Allow reading more than a single sector

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agochain: Run Nindent on com32/modules/chain.c
Shao Miller [Wed, 23 Jun 2010 03:28:03 +0000 (23:28 -0400)]
chain: Run Nindent on com32/modules/chain.c

Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
14 years agomtools: create an empty ADV syslinux-4.00-pre58
H. Peter Anvin [Wed, 23 Jun 2010 00:09:52 +0000 (17:09 -0700)]
mtools: create an empty ADV

Create an install an empty ADV.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agodos: vacuous ADV support
H. Peter Anvin [Wed, 23 Jun 2010 00:07:03 +0000 (17:07 -0700)]
dos: vacuous ADV support

Vacuous ADV support: install an empty ADV.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agosetadv: remove unused, nonportable header file
H. Peter Anvin [Wed, 23 Jun 2010 00:06:23 +0000 (17:06 -0700)]
setadv: remove unused, nonportable header file

This file does not need <sys/types.h>.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agowin32: vacuous ADV support
H. Peter Anvin [Tue, 22 Jun 2010 23:52:32 +0000 (16:52 -0700)]
win32: vacuous ADV support

Install an empty ADV in the Windows installer to keep it from being
broken.  In order to do that, separate the Unix-specific ADV I/O
functions from the generic data structure manipulation.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agowin32: use .obj not .o, and build an intermediate library
H. Peter Anvin [Tue, 22 Jun 2010 22:59:04 +0000 (15:59 -0700)]
win32: use .obj not .o, and build an intermediate library

Use .obj as the extension, rather than .o, to match Windows
conventions.  Furthermore, build an intermediate library for the stuff
that we pick up from elsewhere; this makes it easier to build
additional Windows binaries with helper functions in libinstaller or
another source library.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agopxe: fix the timeout logic for RRQ syslinux-4.00-pre57
H. Peter Anvin [Tue, 22 Jun 2010 22:16:47 +0000 (15:16 -0700)]
pxe: fix the timeout logic for RRQ

Fix the timeout logic for RRQ, to avoid a spew of identical RRQ
packets which at best will annoy the server.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agopxe: fix bugs in DHCP parsing and config file selection
H. Peter Anvin [Tue, 22 Jun 2010 22:03:29 +0000 (15:03 -0700)]
pxe: fix bugs in DHCP parsing and config file selection

Fix several buffer-handling bugs in DHCP parsing and in the config
file selection.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agopxe: correct the generation of the UUID string
H. Peter Anvin [Tue, 22 Jun 2010 21:39:50 +0000 (14:39 -0700)]
pxe: correct the generation of the UUID string

The UUID string was generated incorrectly, starting over for each
component.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
14 years agoMerge remote branch 'erwan/master_new'
H. Peter Anvin [Tue, 22 Jun 2010 21:34:59 +0000 (14:34 -0700)]
Merge remote branch 'erwan/master_new'

14 years agohdt: new release 0.3.6.1
Erwan Velu [Tue, 22 Jun 2010 21:32:09 +0000 (23:32 +0200)]
hdt: new release 0.3.6.1

Increase subrelease for syslinux4.
hdt just only received code cleaning, no new feature.

14 years agohdt: Using syslinux_reboot() call
Erwan Velu [Tue, 22 Jun 2010 21:30:25 +0000 (23:30 +0200)]
hdt: Using syslinux_reboot() call

Rebooting can be achieved via syslinux_reboot() instead of the useless reboot.c32 module.