H. Peter Anvin [Sun, 14 Nov 2010 21:12:28 +0000 (13:12 -0800)]
gfxboot: use a character array for an absolute symbol
The best way to access an absolute symbol is "extern const char
foo[];" -- older gccs let you get away with "extern void" but gcc 4.5
chokes on it.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 14 Nov 2010 21:11:30 +0000 (13:11 -0800)]
disklib: remove improper "inline"
Remove improper inlines from static functions which cause gcc 4.5 to
abort due to inlining failure.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 14 Nov 2010 21:09:48 +0000 (13:09 -0800)]
com32: add a centralized bitops header
Add a centralized bitops header <sys/bitops.h> which uses x86 bitops
instructions. This is necessary to keep gcc 4.5 from aborting
compilation due to the inlined code being larger than the non-inlined
version, and well, we should really use the bitops.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Sun, 14 Nov 2010 20:51:07 +0000 (12:51 -0800)]
Merge branch 'genec-rosh-for-hpa', remote branches 'genec/sample-make-for-hpa', 'genec/drmk-ver-for-hpa' and 'genec/pxechain-for-hpa'
Gene Cumm [Sat, 13 Nov 2010 16:29:08 +0000 (11:29 -0500)]
PXELINUX: shorten code in pxenv call
Now that both scenarios are clear (do/do not call timer_cleanup/
timer_init), shorten it to eliminate a needless jmp.
Gene Cumm [Sat, 13 Nov 2010 16:22:54 +0000 (11:22 -0500)]
PXELINUX: add gPXE PXENV_FILE_EXEC in addition to PXENV_RESTART_TFTP; comments
Both of these calls will not return if successful
Gene Cumm [Sat, 6 Nov 2010 12:09:15 +0000 (08:09 -0400)]
ver.com: Update some of how DRMK is handled
Gene Cumm [Fri, 5 Nov 2010 17:32:52 +0000 (13:32 -0400)]
PXELINUX: Fix timer bug
Certain calls to the PXE stack could potentially remove us from
memory. Revert the INT 1Ch timer to its previous state.
Gene Cumm [Wed, 3 Nov 2010 02:52:09 +0000 (22:52 -0400)]
ver.com: Fix month calculation for DRMK Build Date
Gene Cumm [Mon, 25 Oct 2010 17:01:24 +0000 (13:01 -0400)]
sample/Makefile: re-add the include
Without the include, .ppm.gz to .lss messes up as $(GZIPPROG) is
not expanded properly
Gene Cumm [Mon, 25 Oct 2010 16:59:47 +0000 (12:59 -0400)]
modules/Makefile: add ver.com
Gene Cumm [Mon, 25 Oct 2010 16:56:36 +0000 (12:56 -0400)]
ver.com: Fixed width number output; Conditional skip DOS serial
Create two functions, writedecb[23], to output a byte AL as fixed with of
2 or 3 characters wide, 0 prepend
If all of the DOS Serialnumber is 0, don't bother with printing anything.
Gene Cumm [Mon, 25 Oct 2010 00:03:23 +0000 (20:03 -0400)]
ver.com: Compact file by reuse of string
Gene Cumm [Sun, 24 Oct 2010 21:30:30 +0000 (17:30 -0400)]
ver.com: Update to pull info from DRMK
Gene Cumm [Sun, 24 Oct 2010 21:15:41 +0000 (17:15 -0400)]
core/writedec: Remove writechr; fix overflow in .cloop
writechr is found in other files and this prevents a compile error.
Gene Cumm [Sun, 24 Oct 2010 14:14:53 +0000 (10:14 -0400)]
ver.com: Import from previously private branch as new file
Colin Watson [Wed, 20 Oct 2010 19:23:02 +0000 (21:23 +0200)]
gfxboot: fix buffer overrun when loading kernel/initramfs
If the file size wasn't a multiple of 64KB, we could overwrite the next
entry in the malloc arena so reading the initramfs would fail.
Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
Gene Cumm [Sat, 16 Oct 2010 12:07:02 +0000 (08:07 -0400)]
rosh: rosh_argcat now has length. if DO_DEBUG, show startup command
Gene Cumm [Sat, 16 Oct 2010 11:58:31 +0000 (07:58 -0400)]
rosh: display command entered and a command unknown message when not known
H. Peter Anvin [Fri, 15 Oct 2010 23:41:02 +0000 (16:41 -0700)]
Merge remote branch 'liu/master'
Gene Cumm [Fri, 15 Oct 2010 03:50:58 +0000 (23:50 -0400)]
chain.c32: DRMK: Fix comment at top of source
Gene Cumm [Wed, 13 Oct 2010 23:51:06 +0000 (19:51 -0400)]
chain.c32: DRMK: Add comment about only using a DWORD for partition offset
Gene Cumm [Wed, 13 Oct 2010 23:39:19 +0000 (19:39 -0400)]
chain.c32: DRMK: clean up output; clean up and correct comments
Gene Cumm [Mon, 9 Aug 2010 16:34:32 +0000 (12:34 -0400)]
chain.c: Progress on DRMK and notes that it's not perfect yet.
Gene Cumm [Wed, 13 Oct 2010 20:32:13 +0000 (16:32 -0400)]
Merge branch 'master' into rosh_for_hpa
Gene Cumm [Wed, 13 Oct 2010 20:28:53 +0000 (16:28 -0400)]
rosh: add another item in the ToDos comment
Colin Watson [Wed, 14 Jul 2010 13:11:14 +0000 (14:11 +0100)]
gfxboot: add include and menu include support
Ubuntu CDs use multiple configuration files and the include directive as
well as gfxboot, so it's useful for gfxboot to support these.
Signed-off-by: Colin Watson <cjwatson@ubuntu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Ferenc Wagner [Mon, 11 Oct 2010 15:55:52 +0000 (17:55 +0200)]
doc: extlinux falls back to syslinux.cfg
Signed-off-by: Ferenc Wagner <wferi@niif.hu>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Ferenc Wagner [Mon, 11 Oct 2010 15:55:51 +0000 (17:55 +0200)]
doc: reorganize config file intro
Signed-off-by: Ferenc Wagner <wferi@niif.hu>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Ferenc Wagner [Mon, 11 Oct 2010 15:55:50 +0000 (17:55 +0200)]
doc: comments don't need a leading space
Signed-off-by: Ferenc Wagner <wferi@niif.hu>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 13 Oct 2010 05:46:15 +0000 (22:46 -0700)]
chain.c32: make CHS calculation match core/fs/diskio.c
Use the same format for the CHS calculation as in core/fs/diskio.c;
also, apply the correct limits, and propagate the fix to the write
routine.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 13 Oct 2010 05:42:27 +0000 (22:42 -0700)]
strspn.c: drop "inline"
Drop "inline" from bit operations. These should be recoded to use x86
bts/bt instructions, but for now just drop the "inline" which causes
failures on gcc 4.5 due to inlining failures.
Reported-by: Sebastian Herbszt <herbszt@gmx.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 13 Oct 2010 05:40:46 +0000 (22:40 -0700)]
NEWS: Update for 4.03
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
P J P [Tue, 14 Sep 2010 06:38:37 +0000 (12:08 +0530)]
isohybrid: Use ftruncate instead of seek for final padding
Pad the image via ftruncate instead of seeking to the end (which was
done incorrectly).
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 13 Oct 2010 05:31:09 +0000 (22:31 -0700)]
chain.c32: fix conversion from LBA to CHS
Bits [9:8] of the cylinder goes into the top bits of the sector
register, not the bottom (and the math for that was wrong, anyway.)
Reported-by: Michal Soltys <soltys@ziu.info>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Gene Cumm [Sat, 9 Oct 2010 15:28:48 +0000 (11:28 -0400)]
rosh: Fix rosh_ls(); fix FTBFS on rosh_more(); add ROSH_DEBUG2_ARGV_V macro
Liu Aleaxander [Sat, 9 Oct 2010 15:10:14 +0000 (23:10 +0800)]
lib: Update memmem function
The current memem implementation can not handle the case that the length
of the third parameter(needle) is equal *ONE*. So that the current
strstr implemention doesn't work when the lenght of substring is ONE.
For example, strstr("linux", "l") it will return NULL instead of
"linux", which is not right.
This code is stolen from klibc ;)
Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
Gene Cumm [Sat, 9 Oct 2010 12:32:46 +0000 (08:32 -0400)]
unistd.h: Add missing getopt declarations
Gene Cumm [Sat, 9 Oct 2010 11:41:12 +0000 (07:41 -0400)]
Merge branch 'master' into rosh_for_hpa
Gene Cumm [Sun, 3 Oct 2010 22:28:02 +0000 (18:28 -0400)]
rosh: Remove unneeded cases in rosh_command() switch statements
Gene Cumm [Sun, 3 Oct 2010 16:05:45 +0000 (12:05 -0400)]
rosh: Clean up rosh_command to remove old stuff
Gene Cumm [Sun, 3 Oct 2010 14:02:11 +0000 (10:02 -0400)]
rosh: code cleanup
Gene Cumm [Sun, 3 Oct 2010 13:24:38 +0000 (09:24 -0400)]
rosh: Change rosh_ls()/rosh_dir() to use argc/argv; use getopt()
Gene Cumm [Sun, 3 Oct 2010 13:15:52 +0000 (09:15 -0400)]
rosh: Change rosh_more()/rosh_less() to use argc/argv
Gene Cumm [Sun, 3 Oct 2010 11:22:59 +0000 (07:22 -0400)]
rosh: remove cmdstr from rosh_pwd()
Gene Cumm [Sun, 3 Oct 2010 11:17:54 +0000 (07:17 -0400)]
rosh: clear errno before possibly using it. might be set by a previous call
Gene Cumm [Sun, 3 Oct 2010 11:12:06 +0000 (07:12 -0400)]
rosh: Add argc/argv rosh_reboot(); Allow warm reboots
Gene Cumm [Sun, 3 Oct 2010 11:00:25 +0000 (07:00 -0400)]
rosh: In main, use string macro directly
Gene Cumm [Sun, 3 Oct 2010 10:59:44 +0000 (06:59 -0400)]
rosh: Change rosh_run() to use argc/argv
Gene Cumm [Sat, 2 Oct 2010 17:20:07 +0000 (13:20 -0400)]
rosh: Change rosh_help() to use the string passed to it directly
Gene Cumm [Sat, 2 Oct 2010 05:11:23 +0000 (01:11 -0400)]
rosh: ROSH_DEBUG_ARGV_V in header
Gene Cumm [Sat, 2 Oct 2010 05:10:49 +0000 (01:10 -0400)]
rosh: convert rosh_cat() to argc/argv
Gene Cumm [Sat, 2 Oct 2010 05:05:03 +0000 (01:05 -0400)]
rosh: Add function header comments that were missing
Gene Cumm [Sat, 2 Oct 2010 04:55:02 +0000 (00:55 -0400)]
rosh: Fix warning on rosh_ls_arg(); remove rosh_echo() for rosh_pr_argv()
Gene Cumm [Sat, 2 Oct 2010 04:43:24 +0000 (00:43 -0400)]
rosh: Rename function as it's verbose
rosh_pr_argv and ROSH_DEBUG_ARGV are verbose, printing the
argument number and single-quoted string out.
Gene Cumm [Sat, 2 Oct 2010 04:18:27 +0000 (00:18 -0400)]
rosh: closedir() only if actually opened
Gene Cumm [Sat, 2 Oct 2010 04:16:54 +0000 (00:16 -0400)]
rosh: compact previous commit
Gene Cumm [Sat, 2 Oct 2010 04:13:38 +0000 (00:13 -0400)]
rosh: Fix rosh_ls_arg() to prevent segfault on access denied
Gene Cumm [Sat, 2 Oct 2010 04:03:29 +0000 (00:03 -0400)]
rosh: main, prompt and command try to use argc/argv mostly
prompt still uses a string but parses it and passes the parsed
argc/argv pair to command. main doesn't need a string anymore
Gene Cumm [Fri, 1 Oct 2010 03:11:10 +0000 (23:11 -0400)]
rosh: rosh_cd fix DEBUG
Gene Cumm [Fri, 1 Oct 2010 03:08:24 +0000 (23:08 -0400)]
rosh: fix errors in previous commit
Gene Cumm [Fri, 1 Oct 2010 03:03:35 +0000 (23:03 -0400)]
rosh: change rosh_cd() to use argc/argv
Gene Cumm [Fri, 1 Oct 2010 02:41:21 +0000 (22:41 -0400)]
rosh: Use internal parser for argc/argv; use argc/argv in rosh_command
Gene Cumm [Fri, 24 Sep 2010 02:06:10 +0000 (22:06 -0400)]
rosh: start parse_args(); prep for use; make print_argv()
parse_args() for parsing a string into an argv/argc pair for easier
parsing and the potential use of getopt().
print_argv() for printing an argv/argc pair to show functionality
Gene Cumm [Tue, 20 Jul 2010 15:56:28 +0000 (11:56 -0400)]
rosh: fix commented out WS usage in linux to grab screen size
Gene Cumm [Fri, 9 Jul 2010 00:05:39 +0000 (20:05 -0400)]
rosh: add echo
H. Peter Anvin [Fri, 8 Oct 2010 20:46:26 +0000 (13:46 -0700)]
Merge remote branch 'genec/rosh_for_hpa'
Gene Cumm [Fri, 24 Sep 2010 01:51:14 +0000 (21:51 -0400)]
core: fix handling new directory "/" for CONFIG in ISOLINUX and EXTLINUX
Arwin Vosselman [Thu, 5 Aug 2010 20:17:30 +0000 (22:17 +0200)]
Fix missing option -s in libinstaller
In 'libinstaller/syslxopt.c' on line 71 the "s" (undercast) is missing in:
const char short_options[] = "t:fid:UuzS:H:rvho:OM:ma";
Adding the 's' there seems to solve our problem.
H. Peter Anvin [Thu, 26 Aug 2010 21:45:53 +0000 (14:45 -0700)]
pxe: add a "pxeretry" option to deal with 404's in web apps
For web downloads, sometimes a mirror site will not be fully synced.
Add an option to retry the open a specific number of times before
giving up.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Sat, 14 Aug 2010 00:27:44 +0000 (17:27 -0700)]
extlinux: try to get the disk offset from sysfs
It is possible(?) that HDIO_GETGEO can't return the full offset, and
in either case it is too small -- only 32 bits on 32-bit platforms.
Thus query sysfs for the real value, if available.
sysfs also contains information for slave devices -- this is going to
really matter for the md/lvm issues.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Don Hiatt [Fri, 13 Aug 2010 16:51:12 +0000 (09:51 -0700)]
diskio: remove redundant register write
The disk number is set twice in diskio.c/edd_rdwr_sectors() this patch
removes the redundant setting.
H. Peter Anvin [Wed, 11 Aug 2010 18:50:48 +0000 (11:50 -0700)]
version: next version will be 4.03
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 11 Aug 2010 17:42:51 +0000 (10:42 -0700)]
core: look for invalid MBR handover information address
The Win7 MBR doesn't provide proper handover information. Instead, it
leaves DS:SI = 0:0x7e00, so reject that information as invalid on
grounds that it is pointed into the bootloader area.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Gene Cumm [Sun, 1 Aug 2010 16:55:27 +0000 (12:55 -0400)]
chain: Extra comments; shrink the new space to minimum
Gene Cumm [Sun, 1 Aug 2010 16:39:19 +0000 (12:39 -0400)]
chain: Just assign the value rather than using memcpy()
Gene Cumm [Sun, 1 Aug 2010 14:23:51 +0000 (10:23 -0400)]
chain: add drmk= to usage
Gene Cumm [Sun, 1 Aug 2010 14:23:00 +0000 (10:23 -0400)]
chain: Fix up and clean up DRMK load code; fix filename length; Patch memory.
Gene Cumm [Sun, 1 Aug 2010 03:14:06 +0000 (23:14 -0400)]
chain.c32: prepare for loading DRMK
H. Peter Anvin [Fri, 30 Jul 2010 17:20:08 +0000 (10:20 -0700)]
syslxopt: remove lengthy warning message
Remove a lengthy warning message which cause the actual command
reference to overflow a 24-line screen.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Fri, 30 Jul 2010 17:17:52 +0000 (10:17 -0700)]
syslxopt: fix fatal warnings
Fix fatal warnings in syslxopt.c partly due to legal but non-idiomatic
use of switch(). Since the only purpose was to conditionalize single
output statements, just do it explicitly.
In addition, since they are conditional messages, there is no need to
explain when they apply.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Michal Soltys [Fri, 30 Jul 2010 06:46:07 +0000 (08:46 +0200)]
chain.c: fix public index value in mbr and gpt iterators
mbr and gpt iterators skip empty / non-data partitions properly, but don't
update publicly visible index. With this patch, such partitions are counted as
well.
Signed-off-by: Michal Soltys <soltys@ziu.info>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Gene Cumm [Tue, 27 Jul 2010 22:58:46 +0000 (18:58 -0400)]
libinstaller/syslxopt.c: remove unneeded usage text from certain variants.
Gert Hulselmans noticed this.
Sebastian Herbszt [Tue, 27 Jul 2010 12:46:57 +0000 (14:46 +0200)]
Make __free_tagged actually free memory
__free_tagged called by comboot_cleanup_lowmem (core/mem/free.c) doesn't
seem to work correctly. Memory allocated with lmalloc() isn't marked as free
after the allocating module exits:
boot: mem
lowmem_buf: 0x000353e0
boot: mem
lowmem_buf: 0x000553f0
boot: mem
lowmem_buf: 0x00075400
boot: mem
lowmem_buf: 0x00000000
boot:
The expected behaviour
boot: mem
lowmem_buf: 0x000353e0
boot: mem
lowmem_buf: 0x000353e0
boot: mem
lowmem_buf: 0x000353e0
can be achieved with the following patch.
Gene Cumm [Tue, 27 Jul 2010 02:54:37 +0000 (22:54 -0400)]
Merge branch 'm' into rosh_for_hpa
H. Peter Anvin [Mon, 26 Jul 2010 20:57:34 +0000 (13:57 -0700)]
core: define and use set_flags() helper
Rather than opencoding the arithmetic flag mask, define an inline to
make that happen properly.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 26 Jul 2010 20:33:37 +0000 (13:33 -0700)]
sample: remove obsolete "raw" comboot/com32 samples
We really don't want people to write code without using the library,
so just remove these obsolete and no longer functional samples.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Gene Cumm [Mon, 26 Jul 2010 19:09:43 +0000 (15:09 -0400)]
libmenu: Fix cursor on exit from showmenus()
This fixes the issue in hdt.c32 that Kent Robotti noticed where
exiting directly from Menu Mode caused the cursor to not be displayed.
This same issue also affects com32/cmenu/simple.c32 and probably
others using showmenus().
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Mon, 26 Jul 2010 00:27:37 +0000 (17:27 -0700)]
core: don't hang if no config file is found
If we can't find a configuration file, we need to do something
slightly more friendly than hanging.
Reported-by: Sebastian Herbszt <herbszt@gmx.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Wed, 21 Jul 2010 19:33:13 +0000 (12:33 -0700)]
win64: experimental Win64 installer (syslinux64.exe)
Experimental Win64 installer. This is necessary to be able to run on
WinPE64, since WinPE64 doesn't support running 32-bit binaries.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Wed, 21 Jul 2010 19:00:12 +0000 (12:00 -0700)]
win32: fix README, adjust broken +x bits
Fix the win32/README file and adjust some stray +x bits which had
crept in.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Geert Stappers [Tue, 20 Jul 2010 22:12:36 +0000 (15:12 -0700)]
lua: remove obsolete FIXME comment
Remove an obsolete FIXME comment; the problem was caused by a stale
library.
H. Peter Anvin [Tue, 20 Jul 2010 06:45:18 +0000 (23:45 -0700)]
NEWS: document IP byte order fix.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
H. Peter Anvin [Tue, 20 Jul 2010 06:42:41 +0000 (23:42 -0700)]
pxe: fix byte order of output from parse_dotquad()
parse_dotquad() incorrectly returned output in host byte order.
Reported-by: Alexander Wuerstlein <arw@arw.name>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Shao Miller [Tue, 20 Jul 2010 03:34:04 +0000 (23:34 -0400)]
extlinux, linux: Ignore --force in these installers
Previous commits described this behaviour, but did not
actually implement it. :)
Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
Shao Miller [Tue, 20 Jul 2010 03:21:57 +0000 (23:21 -0400)]
dos: Use libinstaller option parser
We will produce an error message if a user attempts
to use an option we don't implement.
Signed-off-by: Shao Miller <shao.miller@yrdsb.edu.on.ca>
H. Peter Anvin [Tue, 20 Jul 2010 00:36:12 +0000 (17:36 -0700)]
dos: add .size directives to int2526.S
Add .size directives to int2526.S.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Tue, 20 Jul 2010 00:33:22 +0000 (17:33 -0700)]
dos: add .size attribute for syslinux_ldlinux_len
Just for the sake of good order, a .size attribute for
syslinux_ldlinux_len.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Tue, 20 Jul 2010 00:30:30 +0000 (17:30 -0700)]
dos: add missing file ldlinux.S
Add missing assembly wrapper for ldlinux.sys.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
H. Peter Anvin [Tue, 20 Jul 2010 00:28:25 +0000 (17:28 -0700)]
win32: remove an archive before running ar on it
Always remove an archive before ar...
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>