Vladimir 'phcoder' Serbinenko
1a1f408f20
geli support
2011-04-24 00:00:29 +02:00
Vladimir 'phcoder' Serbinenko
8585e54bec
factor cryptodisk part out
2011-04-23 18:00:42 +02:00
Vladimir 'phcoder' Serbinenko
fcf3bfb6ff
small readability improvement
2011-04-23 16:45:00 +02:00
Vladimir 'phcoder' Serbinenko
b896ae82db
small readability improvement
2011-04-23 16:43:55 +02:00
Vladimir 'phcoder' Serbinenko
6f33a8eebc
optimize LRW
2011-04-23 16:41:43 +02:00
Vladimir 'phcoder' Serbinenko
6fd80b9ac4
factor luks_set_key out
2011-04-23 12:40:43 +02:00
Vladimir 'phcoder' Serbinenko
2f179c3236
LRW support
2011-04-23 04:51:53 +02:00
Vladimir 'phcoder' Serbinenko
4b35060f6f
Fix benbi
2011-04-23 03:18:07 +02:00
Vladimir 'phcoder' Serbinenko
ed38c849f4
pcbc support
2011-04-23 02:27:45 +02:00
Vladimir 'phcoder' Serbinenko
95172af9fa
Better IV modes support
2011-04-23 02:04:40 +02:00
Vladimir 'phcoder' Serbinenko
9d647e4e18
New -t luks_uuid
2011-04-22 23:51:16 +02:00
Vladimir 'phcoder' Serbinenko
50ad7d9cae
luks grub-probe support
2011-04-22 23:39:36 +02:00
Vladimir 'phcoder' Serbinenko
fe32915a5e
XTS support
2011-04-22 21:48:32 +02:00
Vladimir 'phcoder' Serbinenko
2cb55e6f73
make grub_password_get work in userland
2011-04-22 21:46:00 +02:00
Vladimir 'phcoder' Serbinenko
84a411c0c3
small argument revamp
2011-04-22 19:51:06 +02:00
Vladimir 'phcoder' Serbinenko
4169260830
grub-fstest luks support
2011-04-22 19:44:41 +02:00
Vladimir 'phcoder' Serbinenko
24089d19e2
Add cheatmounting
2011-04-22 19:20:46 +02:00
Vladimir 'phcoder' Serbinenko
f3470f4eb5
restructure prior to adding cheatmounts
2011-04-22 16:32:27 +02:00
Vladimir 'phcoder' Serbinenko
0aaa85f1a0
merge lazy into luks
2011-04-22 15:13:12 +02:00
Vladimir 'phcoder' Serbinenko
716aa45e40
Fix LVM listing
2011-04-22 14:58:12 +02:00
Vladimir 'phcoder' Serbinenko
4defebbec8
automatic raid members addition
2011-04-22 13:55:30 +02:00
Vladimir 'phcoder' Serbinenko
65b4742cd7
Add lost lvm/ prefix. Autoadd lvm subdevices.
2011-04-22 02:46:36 +02:00
Vladimir 'phcoder' Serbinenko
c0c837c10b
merge devmapper into lazy
2011-04-22 01:21:26 +02:00
Vladimir 'phcoder' Serbinenko
5dad99b730
more linux-like name for LVM volumes
2011-04-22 01:10:24 +02:00
Vladimir 'phcoder' Serbinenko
24b905a11c
Lazy LVM and RAID assembly
2011-04-22 00:09:07 +02:00
Vladimir 'phcoder' Serbinenko
a10e7a5a89
Support grub-probe -t drive
2011-04-21 12:39:31 +02:00
Vladimir 'phcoder' Serbinenko
64516e9df6
Fix couple of UUID problems
2011-04-21 12:39:14 +02:00
Colin Watson
1eb44ae37e
merge trunk
2011-04-21 11:07:10 +01:00
Vladimir 'phcoder' Serbinenko
0c910e9626
merge devmapper into luks
2011-04-21 11:59:51 +02:00
Vladimir 'phcoder' Serbinenko
79cde98f5d
Support luksuuid specification
2011-04-21 11:58:06 +02:00
Vladimir 'phcoder' Serbinenko
a89c3dd3f7
Don't mount the same LUKS volume twice
2011-04-21 11:38:51 +02:00
Colin Watson
cff5e5e58d
grub-core/fs/squash4.c: Add missing GRUB_MOD_LICENSE.
2011-04-21 10:37:45 +01:00
Colin Watson
2e0fbe00d2
merge trunk
2011-04-21 10:36:09 +01:00
Colin Watson
92051871b7
* grub-core/kern/emu/getroot.c
...
(grub_find_root_device_from_mountinfo): Remove non-virtual-device
test that was incorrectly reintroduced in r3214.
Reported by: Ian Dall. Fixes Savannah bug #33133 .
2011-04-21 10:26:29 +01:00
Vladimir 'phcoder' Serbinenko
5709ed126d
small cleanup
2011-04-21 11:17:01 +02:00
Michael Gorven
7217f315d3
LUKS support based on work of Michael Gorven with some code from Clemens Fruhwirth and heavily cleaned up by me (phcoder)
...
Also-By: Clemens Fruhwirth <clemens@endorphin.org>
Also-By: Vladimir Serbinenko <phcoder@gmail.com>
2011-04-21 11:14:29 +02:00
Colin Watson
b13f79a427
Fix stack pointer handling in 16-bit relocator.
...
* grub-core/lib/i386/relocator16.S (grub_relocator16_start): Move
grub_relocator16_sp to %esp rather than %ss, and zero-extend it.
Fixes Ubuntu bug #683904 .
2011-04-21 00:07:22 +01:00
Vladimir 'phcoder' Serbinenko
d97e7b5935
* include/grub/dl.h [ASM_FILE]: Adapt for assembly.
...
* grub-core/lib/i386/setjmp.S: Add missing GRUB_MOD_LICENSE.
* grub-core/lib/x86_64/setjmp.S: Likewise.
* grub-core/lib/mips/setjmp.S: Likewise.
* grub-core/lib/powerpc/setjmp.S: Likewise.
* grub-core/lib/sparc64/setjmp.S: Likewise.
2011-04-20 01:37:48 +02:00
Vladimir 'phcoder' Serbinenko
0624551c22
* grub-core/lib/efi/datetime.c: Add missing GRUB_MOD_LICENSE.
...
* grub-core/lib/efi/datetime.c: Likewise.
2011-04-20 01:32:21 +02:00
Vladimir 'phcoder' Serbinenko
e8f28d4c0e
* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_flush):
...
New function.
(grub_util_biosdisk_close): Use grub_util_biosdisk_flush.
* include/grub/emu/hostdisk.h (grub_util_biosdisk_flush): New proto.
* util/grub-setup.c (setup): Use grub_util_biosdisk_flush.
2011-04-19 22:39:14 +02:00
Vladimir 'phcoder' Serbinenko
bba79a1502
* grub-core/term/gfxterm.c (grub_gfxterm_fullscreen): Preserve previous
...
bitmap.
(grub_gfxterm_term_init): Likewise.
2011-04-19 22:31:50 +02:00
Vladimir 'phcoder' Serbinenko
abc474ef4b
Take into account the decorations the computing menu entry width.
...
* grub-core/gfxmenu/widget-box.c (get_border_width): New function.
(grub_gfxmenu_create_box): Register get_border_width.
* grub-core/gfxmenu/gui_list.c (draw_menu): Use get_border_width
if available.
* include/grub/gfxwidgets.h (grub_gfxmenu_box): New member
get_border_width.
2011-04-19 00:44:53 +02:00
Endres Puschner
e74b3947af
* grub-core/gfxmenu/icon_manager.c (grub_gfxmenu_icon_manager_get_icon):
...
Don't skip first class.
2011-04-18 23:24:41 +02:00
Vladimir 'phcoder' Serbinenko
34faa5955a
* grub-core/fs/btrfs.c (grub_btrfs_read_logical): Support huge
...
chunks.
* include/grub/err.h (grub_err_t): New enum value GRUB_ERR_BUG.
2011-04-18 23:10:19 +02:00
Vladimir 'phcoder' Serbinenko
93a777e388
Complete 64-bit division support.
...
* grub-core/kern/misc.c (grub_divmod64): Rename to ...
(grub_divmod64_full): ... this. Support 64-bit divisor and reminder.
* include/grub/misc.h (grub_divmod64): Rename to ...
(grub_divmod64_full): ... this.
(grub_divmod64): New inline function.
2011-04-18 23:03:52 +02:00
Vladimir 'phcoder' Serbinenko
50d2cc5ae5
Identify RAID by its UUID rather than (guessed) name.
...
* grub-core/disk/raid.c (ascii2hex): New function.
(grub_raid_open): Accept mduuid/%s specification.
* grub-core/kern/emu/getroot.c (get_mdadm_name): Revamped into ...
(get_mdadm_uuid): ... this.
(grub_util_get_grub_dev): Use mduuid/%s if UUID is available.
2011-04-16 15:27:35 +02:00
Vladimir 'phcoder' Serbinenko
e03f7bea45
* grub-core/gfxmenu/gui_image.c (rescale_image): Don't attempt to scale
...
to negative size.
2011-04-16 09:16:44 +02:00
Vladimir 'phcoder' Serbinenko
d8a2bcf564
contiguous read
2011-04-15 21:42:29 +02:00
Vladimir 'phcoder' Serbinenko
bd671cc4fe
Use Block IO on EFI
2011-04-15 18:15:06 +02:00
Colin Watson
78fa584f67
Rewrite /proc/self/mountinfo handling to cope with bind-mounts and
...
move-mounts appearing out of order. Fixes Ubuntu bug #738345 .
* grub-core/kern/emu/getroot.c (find_root_device_from_mountinfo):
Build a list of relevant visible mounts using the mnt_id and
parent_mnt_id fields, and then scan that list at the end.
2011-04-13 12:36:04 +01:00
Vladimir 'phcoder' Serbinenko
fe6b2cbaa6
BtrFS support. Written by me (Vladimir) with important bugfixes and
...
even more important testing by Colin.
* Makefile.util.def (libgrubmods.a): Add crc.c and gzio.c
* grub-core/Makefile.core.def (btrfs): Add crc.c.
* grub-core/fs/btrfs.c: Stub replaced with real implementation.
* grub-core/io/gzio.c (grub_gzio): New fields mem_input_size,
mem_input_off and mem_input. All users updated to accept in-RAM input.
(gzio_seek): New function.
(test_zlib_header): Likewise.
(grub_gzio_read): Likewise.
(grub_zlib_decompress): Likewise.
* grub-core/kern/emu/getroot.c (grub_find_root_device_from_mountinfo):
Accept partial and non-virtual mounts.
(grub_guess_root_device): Do rescanning after device_from_mountinfo to
avoid receiving /dev/dm-X as device.
* grub-core/kern/emu/misc.c (grub_make_system_path_relative_to_its_root):
Handle bind and partial mounts.
* grub-core/lib/crc.c: New file.
* include/grub/deflate.h: Likewise.
* include/grub/emu/misc.h (grub_find_root_device_from_mountinfo): New
proto.
* include/grub/lib/crc.h: New file.
2011-04-11 23:26:41 +02:00
Vladimir 'phcoder' Serbinenko
e745cf0ca6
Implement automatic module license checking according to new GNU
...
guidelines.
* grub-core/kern/dl.c (grub_dl_check_license): New function.
(grub_dl_load_core): Use grub_dl_check_license.
* include/grub/dl.h (GRUB_MOD_SECTION): New macro.
(GRUB_MOD_LICENSE): Likewise.
(GRUB_MOD_DUAL_LICENSE): Likewise.
All modules updated.
2011-04-11 23:01:51 +02:00
Colin Watson
2a9bc0169e
* grub-core/fs/btrfs.c (grub_btrfs_fs) [GRUB_UTIL]: Set
...
reserved_first_sector to 1. btrfs reserves plenty of space for boot
loaders.
Reported by: Gene Cumm. Fixes Ubuntu bug #757446 .
2011-04-11 16:06:37 +01:00
Vladimir 'phcoder' Serbinenko
8fc88523dd
Add minix3 to util filesystems
2011-04-11 14:09:02 +02:00
Vladimir 'phcoder' Serbinenko
65f01628e1
unify minix3 and minix2 inode declarations
2011-04-11 08:56:42 +02:00
Vladimir 'phcoder' Serbinenko
58ee1408a8
Fix an error in minix inode declaration
2011-04-11 08:53:28 +02:00
Feiran Zheng
3dd3dd335f
minix3fs support
2011-04-11 08:16:13 +02:00
Vladimir 'phcoder' Serbinenko
c7ba1ba62e
merge mainline into butter
2011-04-11 07:56:31 +02:00
Vladimir 'phcoder' Serbinenko
6a01f54aff
use actually filled extent size if available
2011-04-11 07:53:21 +02:00
Vladimir 'phcoder' Serbinenko
565f076311
Take extent offset in account on uncompressed extents
2011-04-11 07:52:39 +02:00
Vladimir 'phcoder' Serbinenko
228f95a250
Fix filename comparison
2011-04-11 07:51:15 +02:00
Vladimir 'phcoder' Serbinenko
ec25b87d29
Add dprintfs to report chunk lookups
2011-04-11 07:50:22 +02:00
Vladimir 'phcoder' Serbinenko
e8980227e8
Remove stale comment about redundancy
2011-04-11 07:49:26 +02:00
Vladimir 'phcoder' Serbinenko
9ee8d94faa
* grub-core/kern/file.c (grub_file_open): Don't take into account the
...
parenthesis in the middle of the filename.
2011-04-11 07:38:42 +02:00
Vladimir 'phcoder' Serbinenko
b01abe3e16
* grub-core/loader/mips/linux.c (grub_cmd_initrd): Use correct limits
...
rather than trying to put initrd way too high.
Reported by: Ryan Lortie <desrt@desrt.ca>
2011-04-10 16:44:11 +02:00
Vladimir 'phcoder' Serbinenko
335bda1e57
* grub-core/boot/mips/yeeloong/fwstart.S (no_cs5536): Put back
...
improperly removed string.
2011-04-10 16:12:31 +02:00
Vladimir 'phcoder' Serbinenko
5ca1a64de6
* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_data): New member
...
is_disk.
(grub_util_biosdisk_open): Don't apply ioctl on non-disk devices.
(open_device) Likewise.
(grub_util_biosdisk_close): Likewise.
Reported by: Mark Korenberger.
2011-04-10 16:08:58 +02:00
Colin Watson
088cdb65eb
* grub-core/gnulib/argp-parse.c (__argp_input): Don't crash if pstate
...
is NULL.
2011-04-10 15:25:52 +02:00
Vladimir 'phcoder' Serbinenko
8b8a81fa6a
Dynamically count the number of lines for the lower banner.
...
* grub-core/normal/menu_entry.c (per_term_screen): New member
num_entries.
(print_down): Use num_entries.
(update_screen): Likewise.
(grub_menu_entry_run): Set num_entries.
* grub-core/normal/menu_text.c (menu_viewer_data): New member
num_entries.
(grub_print_message_indented): Move real part to ...
(grub_print_message_indented_real): ... here. Additional argument
dry_run.
(draw_border): Additional argument num_entries.
(print_message): Additional argument dry_run.
(print_entries): Receive menu viewer data.
(grub_menu_init_page): New argment num_entries.
(menu_text_set_chosen_entry): Use num_entries.
(grub_menu_try_text): Likewise.
* grub-core/normal/term.c (print_ucs4_terminal): New argument dry_run.
All users updated.
(grub_ucs4_count_lines): New function.
* include/grub/term.h (grub_term_cursor_x): Moved from here ..
* grub-core/normal/menu_text.c (grub_term_cursor_x): ... to here.
* include/grub/term.h (GRUB_TERM_MESSAGE_HEIGHT): Removed.
(grub_term_border_height): Likewise.
(grub_term_num_entries): Likewise.
2011-04-10 13:56:23 +02:00
Vladimir 'phcoder' Serbinenko
277f955bf1
* grub-core/boot/mips/yeeloong/fwstart.S: Fix address to error message.
...
Remove now unused string.
2011-04-10 11:57:19 +02:00
Vladimir 'phcoder' Serbinenko
099821e9e4
Fix RAID1/duplicated chunk size calculation
2011-04-09 21:55:50 +02:00
Colin Watson
2c58372857
* docs/grub-dev.texi: Fix spelling of "developer" throughout.
...
* grub-core/fs/i386/pc/pxe.c (parse_dhcp_vendor): Fix spelling of
"development".
2011-04-08 14:01:51 +01:00
Vladimir 'phcoder' Serbinenko
d7a565e962
* grub-core/normal/menu_entry.c (run): Use grub_memcpy rather than
...
grub_strcpy since the lines aren't necessarily 0-terminated.
2011-04-08 14:37:13 +02:00
Vladimir 'phcoder' Serbinenko
7c2e4909c3
* grub-core/lib/legacy_parse.c (legacy_commands): Find doesn't set
...
root on legacy.
2011-04-08 14:32:41 +02:00
Vladimir 'phcoder' Serbinenko
34c09785b6
* grub-core/commands/probe.c (options): Argument to set isn't optional.
...
(GRUB_MOD_INIT): DEVICE isn't optional.
2011-04-08 14:28:19 +02:00
Vladimir 'phcoder' Serbinenko
6a6f80587b
* grub-core/normal/term.c (print_ucs4_terminal): Don't try to put the
...
word on new line if it's too long anyway. Fixes a hang.
2011-04-08 14:25:44 +02:00
Vladimir 'phcoder' Serbinenko
4ed4ce5820
correct Changelog spelling
2011-04-08 13:59:07 +02:00
Vladimir 'phcoder' Serbinenko
cb180fdf06
revert last revision. It's ineffective
2011-04-08 13:18:27 +02:00
Vladimir 'phcoder' Serbinenko
947aa4f886
* grub-core/Makefile.am: Properly escape parenthesis in sed expressions.
...
Fixes Estonian locale.
Reported by: Leho Kraav.
2011-04-08 12:13:44 +02:00
Vladimir 'phcoder' Serbinenko
f7148863eb
* grub-core/normal/menu.c: Add missing include.
2011-04-08 12:12:02 +02:00
Vladimir 'phcoder' Serbinenko
3c0e3f142a
* grub-core/disk/raid.c [GRUB_UTIL]: Add missing include.
2011-04-08 12:06:55 +02:00
Vladimir 'phcoder' Serbinenko
478182a838
* grub-core/kern/emu/hostdisk.c (open_device): Sync on close and not
...
on open.
(grub_util_biosdisk_close): Likewise.
2011-04-08 11:49:38 +02:00
Vladimir 'phcoder' Serbinenko
72a89a54e1
* grub-core/kern/emu/getroot.c (grub_util_get_grub_dev): Add missing
...
const attribute and use grub_isdigit.
2011-04-08 11:44:44 +02:00
Andrey
b5ebecfabc
* grub-core/video/fb/video_fb.c (grub_video_fb_setup): Silence older
...
gcc warning.
2011-04-06 14:21:34 +02:00
Vladimir 'phcoder' Serbinenko
7755f66e64
* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_align): Add few
...
useful grub_dprintf's.
2011-04-06 14:04:52 +02:00
Vladimir 'phcoder' Serbinenko
adf594cc44
Output errors if theme loading failed.
...
* grub-core/gfxmenu/gfxmenu.c (grub_gfxmenu_try): Move the call to
grub_gfxterm_fullscreen on error paths to ...
* grub-core/normal/menu.c (menu_init): ...here. Wait after showing
theme loading error.
2011-04-06 13:00:18 +02:00
Vladimir 'phcoder' Serbinenko
a562b47916
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Detect spares
...
and report them as not RAID members since they are useless for GRUB.
* grub-core/disk/mdraid_linux.c (grub_mdraid_detect): Likewise.
2011-04-06 12:29:49 +02:00
Vladimir 'phcoder' Serbinenko
5bfb6e71e8
features support
2011-04-05 15:05:53 +02:00
Vladimir 'phcoder' Serbinenko
b38a498394
BPB patching support (untested)
2011-04-05 14:40:15 +02:00
Vladimir 'phcoder' Serbinenko
6ac14e6cef
Fix EFI compilation
2011-04-05 09:34:58 +02:00
Vladimir 'phcoder' Serbinenko
850e937329
Increase LVM implementation robustness in order not to crash on
...
configurations like pvmove. Previously code assumed that in some places
only lvs or only pvs are used whereas it seems that they are used
interchangeably.
* grub-core/disk/lvm.c (read_node): New function.
(read_lv): Use read_node.
(grub_lvm_scan_device): Use only first mirror on pvmove'd lvs.
Match volumes only at the end when all lvs are found. Take both
pvs (first) and lvs (second) into account.
* include/grub/lvm.h (grub_lvm_segment): Merge fields stripe_* and
mirror_* into node_*. All users updated.
(grub_lvm_stripe): Merge this ...
(grub_lvm_mirror): ... and this ...
(grub_lvm_node): ... into this. All users updated.
2011-04-03 16:28:14 +02:00
Vladimir 'phcoder' Serbinenko
6f33215394
* grub-core/disk/lvm.c (grub_lvm_scan_device): Print errors on the end
...
of function to allow further scanning for LVMs.
2011-04-03 15:57:44 +02:00
Vladimir 'phcoder' Serbinenko
829ea451a4
* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_read): Don't close
...
on failed seek as it breaks open fd reusage.
2011-04-03 15:45:20 +02:00
Colin Watson
2cccc747ac
Store the loopback device as data on loopback grub_disk structures,
...
rather than the file it points to. This fixes use of freed memory
if an existing loopback device is replaced.
* grub-core/disk/loopback.c (grub_loopback_open): Store dev in
disk->data, not dev->file.
(grub_loopback_read): Adjust file assignment to match.
Fixes Ubuntu bug #742967 .
2011-04-01 17:04:10 +01:00
Colin Watson
186ae367af
* grub-core/disk/loopback.c (grub_cmd_loopback): Fix a memory leak
...
when replacing an existing device.
2011-04-01 15:35:09 +01:00
Vladimir 'phcoder' Serbinenko
cfed2ad097
Fix incorrect types in jfs.c. This enables >2TiB disks and fixes some
...
memory corruptions.
* grub-core/fs/jfs.c (struct grub_jfs_diropen): Interpret bytes as
unsigned.
(grub_jfs_lookup_symlink): Make ino a grub_uint32_t rather than int.
(grub_jfs_blkno): Use 64-bit quantities for block sectors.
(grub_jfs_read_inode): Likewise.
(grub_jfs_opendir): Likewise. Remove now useless casts.
(grub_jfs_getent): Likewise.
Make ino a grub_uint32_t rather than int.
(grub_jfs_mount): Ensure that blksize and log2_blksize are consistent.
(grub_jfs_read_file): Use 64-bit quantities when necessary. Replace
division and module with bit operations.
(grub_jfs_find_file): Make ino a grub_uint32_t.
(grub_jfs_lookup_symlink): Likewise. Use 64-bit quantities
2011-04-01 15:53:06 +02:00
Colin Watson
05d2ed3277
* grub-core/normal/menu_entry.c (run): Quieten uninitialised
...
warning. (This was in fact always initialised before use, but GCC
wasn't smart enough to prove that.)
* grub-core/script/lexer.c (grub_script_lexer_yywrap): Likewise.
2011-04-01 11:43:51 +01:00
Vladimir 'phcoder' Serbinenko
ecb2a8b656
merge my and Abranches' branches
2011-04-01 11:25:48 +02:00
Manoel Rebelo Abranches
25f1579b43
Adapt protocols to new network struct.
2011-04-01 05:42:34 -03:00
Manoel Rebelo Abranches
457d1104f6
Add ofnet.h to Makefile.am
2011-04-01 05:40:44 -03:00
Manoel Rebelo Abranches
59b361a2df
Use bootp packet to set prefix and card address.
2011-04-01 05:39:06 -03:00
Manoel Rebelo Abranches
6d5c2ed68a
Use nb in all function declarations for consistency.
2011-04-01 05:27:06 -03:00
Manoel Rebelo Abranches
6ccb7a35e6
Remove unused file.
2011-04-01 05:26:27 -03:00
Manoel Rebelo Abranches
fbdee79b17
Add generic functions to read and seek in network file. Allocate socket with network and adress information.
2011-04-01 05:22:41 -03:00
Manoel Rebelo Abranches
d5e0a358f1
Correctly match network.
2011-04-01 05:14:16 -03:00
Manoel Rebelo Abranches
6dc14451f4
Iterate sockets to see if we expect this packet. Let the App layer to remove its own header. Add packet to socket list if it contains data. Undesired packets are freed.
2011-04-01 05:12:44 -03:00
Manoel Rebelo Abranches
50ee5d686d
Merge mainline.
2011-04-01 04:45:37 -03:00
Vladimir 'phcoder' Serbinenko
91dc607330
* grub-core/kern/x86_64/efi/callwrap.S (efi_wrap_0): Preserve 16-byte
...
stack alignment.
(efi_wrap_1): Likewise.
(efi_wrap_2): Likewise.
(efi_wrap_3): Likewise.
(efi_wrap_4): Likewise.
(efi_wrap_5): Likewise.
(efi_wrap_6): Likewise.
(efi_wrap_10): Likewise.
Based on information by: Red Hat/Peter Jones.
2011-03-31 16:48:36 +02:00
Colin Watson
a8afc1d12c
* grub-core/mmap/efi/mmap.c (grub_mmap_unregister): Remove
...
set-but-not-used variable.
2011-03-31 12:25:10 +01:00
Vladimir 'phcoder' Serbinenko
241e41f55c
* grub-core/disk/raid.c (insert_array): Add few potentially
...
useful grub_util_info.
(grub_raid_register): Likewise.
2011-03-30 16:54:11 +02:00
Vladimir 'phcoder' Serbinenko
56445fb2b4
* grub-core/kern/emu/getroot.c (grub_util_get_grub_dev) [__linux__]:
...
Preserve partition number in mdadm code path.
2011-03-30 16:37:10 +02:00
Vladimir 'phcoder' Serbinenko
c871b1c6d0
* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_get_grub_dev): Add
...
few potentially useful grub_util_info.
2011-03-30 13:13:25 +02:00
Vladimir 'phcoder' Serbinenko
87d1aa1927
* grub-core/disk/lvm.c (grub_lvm_scan_device): Remove spurious \n.
2011-03-30 13:02:39 +02:00
Vladimir 'phcoder' Serbinenko
5d8031749e
* grub-core/term/at_keyboard.c (set_scancodes)
...
[!GRUB_MACHINE_MIPS_YEELOONG && !GRUB_MACHINE_QEMU]: Use scancode set 1.
2011-03-30 09:26:23 +02:00
Vladimir 'phcoder' Serbinenko
fc18f6a3cb
* util/grub.d/10_linux.in: Skip vmlinux-* on x86 platforms.
2011-03-29 19:47:34 +02:00
Colin Watson
61d7156b94
* grub-core/disk/loopback.c (GRUB_MOD_INIT): Stop documenting
...
removed -p option.
2011-03-29 18:00:23 +01:00
Vladimir 'phcoder' Serbinenko
cf4d3fa640
Send blend_text_bg when any backgorund is set as opposed to only when streteched background is set
2011-03-29 18:34:05 +02:00
Vladimir 'phcoder' Serbinenko
9e4d19e0d3
* grub-core/kern/emu/hostdisk.c (find_partition_start)
...
[HAVE_DIOCGDINFO]: Add safety checks.
2011-03-29 15:00:23 +02:00
Colin Watson
b4db4f39f0
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): If
...
real_sb->size is zero (e.g. RAID-0), get the disk size from
real_sb->data_size instead.
Fixes Ubuntu bug #743136 .
2011-03-29 10:51:58 +01:00
Vladimir 'phcoder' Serbinenko
35e5f84c18
* grub-core/normal/misc.c (grub_normal_print_device_info): Use correct
...
printf clauses for printing size and start.
2011-03-29 11:25:04 +02:00
Vladimir 'phcoder' Serbinenko
d2e29d81a9
* grub-core/fs/ext2.c (grub_ext2_read_inode): Fix an overflow.
...
Reported and tested by: Timothy Nikkel.
2011-03-29 10:56:14 +02:00
Vladimir 'phcoder' Serbinenko
ed5587afea
* grub-core/term/gfxterm.c (dirty_region_add): Move core part to ...
...
(dirty_region_add_real): ... this.
(dirty_region_add): Don't discard margin refresh when performing
scheduled repaint.
2011-03-29 08:33:28 +02:00
Vladimir 'phcoder' Serbinenko
a1dc717c58
* grub-core/lib/relocator.c (allocate_regstart)
...
[!DEBUG_RELOCATOR_NOMEM_DPRINTF]: Avoid grub_dprintf since not all
terminals are capabple of malloc-free operation.
(allocate_inreg) [!DEBUG_RELOCATOR_NOMEM_DPRINTF]: Likewise.
(malloc_in_range) [!DEBUG_RELOCATOR_NOMEM_DPRINTF]: Likewise.
2011-03-29 08:20:19 +02:00
Vladimir 'phcoder' Serbinenko
09573499ff
Initial variable sector size support
2011-03-29 02:02:55 +02:00
Colin Watson
2414872538
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Remove stale
...
comment.
2011-03-28 15:17:22 +01:00
Colin Watson
f329eda79e
* grub-core/disk/raid.c (grub_raid_register): Adjust debug message
...
to be specific about what kind of RAID device we're scanning for.
2011-03-28 13:23:54 +01:00
Seth Goldberg
c482ad98b3
* grub-core/kern/emu/getroot.c (find_root_device_from_libzfs): Don't return freed string.
2011-03-26 23:22:59 +01:00
Vladimir 'phcoder' Serbinenko
5ee04984d1
* grub-core/fs/iso9660.c (grub_iso9660_label): Rtrim the label.
2011-03-26 14:14:59 +01:00
Vladimir 'phcoder' Serbinenko
f4727da93f
Use libgeom on FreeBSD to detect partitions.
...
* Makefile.util.def (grub-mkimage): Add LIBGEOM to ldadd.
(grub-mkrelpath): Likewise.
(grub-script-check): Likewise.
(grub-editenv): Likewise.
(grub-mkpasswd-pbkdf2): Likewise.
(grub-fstest): Likewise.
(grub-mkfont): Likewise.
(grub-mkdevicemap): Likewise.
(grub-probe): Likewise.
(grub-setup): Likewise.
(grub-ofpathname): Likewise.
(grub-mklayout): Likewise.
(example_unit_test): Likewise.
(grub-menulst2cfg): Likewise.
* grub-core/Makefile.core.def (grub-emu): Likewise.
(grub-emu-lite): Likewise.
* configure.ac: Check for -lgeom on FreeBSD and set LIBGEOM.
* grub-core/kern/emu/hostdisk.c [FreeBSD]: Include libgeom.h. Don't
define HAVE_DIOCGDINFO.
(follow_geom_up) [FreeBSD]: New function.
(find_partition_start) [FreeBSD]: Rewritten using follow_geom_up.
(convert_system_partition_to_system_disk) [FreeBSD]: Likewise.
(grub_util_biosdisk_get_grub_dev) [FreeBSD]: Use FreeBSD path
unconditionally of HAVE_DIOCGDINFO.
2011-03-26 12:59:02 +01:00
Vladimir 'phcoder' Serbinenko
82fe6c751b
Fix FreeBSD compilation problem.
...
* grub-core/kern/emu/hostdisk.c (MAJOR) [FreeBSD]: New definition.
(FLOPPY_MAJOR) [FreeBSD]: Likewise.
2011-03-26 12:49:34 +01:00
Colin Watson
4c6c9431d2
* grub-core/video/fb/video_fb.c (grub_video_fb_get_info_and_fini):
...
Switch back to page zero before loading a kernel, since some kernel
drivers expect that.
Thanks to: Felix Kuehling.
2011-03-25 00:03:54 +00:00
Vladimir 'phcoder' Serbinenko
c7064d9425
* grub-core/lib/relocator.c (grub_relocator_alloc_chunk_addr)
...
[DEBUG_RELOCATOR]: Reuse grub_mm_check.
(grub_relocator_alloc_chunk_align) [DEBUG_RELOCATOR]: Likewise.
2011-03-24 12:45:51 +01:00
Vladimir 'phcoder' Serbinenko
ef6de21af4
* grub-core/lib/relocator.c (allocate_inreg): Avoid dprintf unless
...
DEBUG_RELOCATOR is defined since gfxterm can't cope with output when
malloc is disabled.
2011-03-24 12:39:48 +01:00
Vladimir 'phcoder' Serbinenko
8bc66a2ce6
* grub-core/loader/i386/bsdXX.c (grub_freebsd_load_elfmodule): Account
...
for modules headers when counting the needed allocation size.
2011-03-24 12:28:22 +01:00
Vladimir 'phcoder' Serbinenko
5657722c3c
* grub-core/term/gfxterm.c (calculate_normal_character_width): Return 8
...
if no ASCII character is found to prevent crash.
2011-03-23 20:29:17 +01:00
Alexander Kurtz
41a85f5508
* grub-core/video/bitmap.c (match_extension): Ignore case.
2011-03-23 17:08:56 +01:00
Colin Watson
ebad0b81be
remove unused variable
2011-03-23 14:45:04 +00:00
Vladimir 'phcoder' Serbinenko
59e1e5f17b
* grub-core/normal/menu_entry.c (init_line): Fix off-by-one error.
2011-03-23 14:18:56 +01:00
Vladimir 'phcoder' Serbinenko
bd4d051a95
* grub-core/script/parser.y: Declare "time" as valid argument.
2011-03-23 13:23:50 +01:00
Vladimir 'phcoder' Serbinenko
537dc9bec6
* grub-core/normal/main.c (GRUB_MOD_INIT): Export pager variable.
2011-03-23 12:40:15 +01:00
Vladimir 'phcoder' Serbinenko
fa3e01bfb5
* grub-core/lib/i386/pc/biosnum.c: Add missing include.
2011-03-23 12:23:42 +01:00
Vladimir 'phcoder' Serbinenko
b1d2840445
* grub-core/disk/usbms.c (grub_usbms_reset): Transform USB-style error
...
into GRUB-style one.
2011-03-23 12:21:15 +01:00
Vladimir 'phcoder' Serbinenko
e804e7b099
missing file in last change
2011-03-23 12:18:21 +01:00
Vladimir 'phcoder' Serbinenko
2e3e2e0908
* grub-core/bus/usb/usbtrans.c (grub_usb_control_msg): Return usb-style
...
error and not grub_errno.
* grub-core/bus/usb/usbhub.c (grub_usb_add_hub): Likewise.
2011-03-23 12:17:05 +01:00
Vladimir 'phcoder' Serbinenko
ed57e55702
* grub-core/bus/usb/uhci.c (grub_uhci_detect_dev): Return
...
GRUB_USB_SPEED_NONE in case of failure and not the error code.
2011-03-23 12:13:39 +01:00
Vladimir 'phcoder' Serbinenko
d1611f0163
* grub-core/efiemu/i386/pc/cfgtables.c
...
(grub_machine_efiemu_init_tables): Make declaration a prototype.
* grub-core/loader/xnu.c (grub_xnu_lock): Likewise.
(grub_xnu_unlock): Likewise.
* grub-core/normal/cmdline.c (grub_cmdline_get/cl_set_pos_all): Likewise.
2011-03-23 12:08:33 +01:00
Vladimir 'phcoder' Serbinenko
7d4e39d65a
* grub-core/bus/usb/usb.c (attach_hooks): Make static.
...
* grub-core/bus/usb/usbhub.c (hubs): Likewise.
* grub-core/commands/hashsum.c (aliases): Likewise.
* grub-core/commands/setpci.c (pci_registers): Likewise.
* grub-core/disk/usbms.c (attach_hook): Likewise.
* grub-core/fs/zfs/zfs.c (decomp_table): Likewise.
(zio_checksum_table): Likewise.
* grub-core/gettext/gettext.c (grub_gettext_msg_list): Likewise.
* grub-core/gfxmenu/gfxmenu.c (cached_view): Likewise.
* grub-core/lib/legacy_parse.c (legacy_commands): Likewise.
* grub-core/lib/relocator.c (leftovers): Likewise.
(extra_blocks): Likewise.
* grub-core/loader/i386/bsd.c (relocator): Likewise.
* grub-core/loader/i386/multiboot_mbi.c (modules): Likewise.
(modules_last): Likewise.
* grub-core/loader/i386/xnu.c (table_aliases): Likewise.
(devices): Likewise.
* grub-core/loader/multiboot_mbi2.c (modules): Likewise.
(modules_last): Likewise.
* grub-core/normal/auth.c (users): Likewise.
* grub-core/normal/context.c (initial_menu): Likewise.
(current_menu): Likewise.
* grub-core/normal/crypto.c (crypto_specs): Likewise.
* grub-core/term/serial.c (grub_serial_ports): Likewise.
(grub_serial_terminfo_input_template): Likewise.
(grub_serial_terminfo_output_template): Likewise.
(grub_serial_terminfo_input): Likewise.
(grub_serial_terminfo_output): Likewise.
(registered): Likewise.
* grub-core/term/usb_keyboard.c (attach_hook): Likewise.
2011-03-23 12:05:13 +01:00
Vladimir 'phcoder' Serbinenko
40fc46599d
* grub-core/video/bochs.c (grub_video_bochs_setup): Use
...
grub_video_mode_type_t.
* grub-core/video/cirrus.c (grub_video_cirrus_setup): Likewise.
* grub-core/video/i386/pc/vbe.c (grub_video_vbe_setup): Likewise.
* grub-core/video/i386/pc/vga.c (grub_video_vga_setup): Likewise.
2011-03-23 11:54:58 +01:00
Colin Watson
9b43bf396a
* grub-core/boot/i386/pc/lnxboot.S (real_code_2): Ensure that the
...
initial chunk read from the kernel always includes GRUB's multiboot
header, which is now outside the first sector.
2011-03-11 11:51:10 +00:00
Colin Watson
be1a7ce0cf
* grub-core/loader/i386/linux.c (find_efi_mmap_size): Page-align
...
cached mmap_size, so that this works correctly when called multiple
times.
Reported by: Daniel Kahn Gillmor. Should fix Debian bug #616638 .
2011-03-09 17:38:31 +00:00
Szymon Janc
57d75699d6
2011-03-07 Szymon Janc <szymon@janc.net.pl>
...
* grub-core/fs/zfs/zfs.c (zap_leaf_lookup):
Set-but-not-used variable removed.
2011-03-07 22:23:06 +01:00
Vladimir 'phcoder' Serbinenko
54da1febce
Rename mipsel-yeeloong to mipsel-loongson
2011-02-19 13:18:05 +01:00
Colin Watson
28f9509eb7
merge trunk
2011-02-17 14:51:11 +00:00
Vladimir 'phcoder' Serbinenko
028501a0e0
Workaround yet another IEEE1275 bug.
...
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New enum value
GRUB_IEEE1275_FLAG_BROKEN_ADDRESS_CELLS.
* grub-core/kern/ieee1275/mmap.c (grub_machine_mmap_iterate): Ignore
adress_cells and size:cells if GRUB_IEEE1275_FLAG_BROKEN_ADDRESS_CELLS
is set.
* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
GRUB_IEEE1275_FLAG_BROKEN_ADDRESS_CELLS on powermacs.
2011-02-12 10:22:55 +03:00
Vladimir 'phcoder' Serbinenko
d998657dcf
* grub-core/partmap/msdos.c (pc_partition_map_embed): Fix off by one
...
error.
2011-02-12 09:59:04 +03:00
Colin Watson
7e735e4349
* include/grub/file.h (not_easly_seekable): Rename to ...
...
(not_easily_seekable): ... this. Update all users.
2011-02-08 13:21:13 +00:00
Colin Watson
5870a4a06f
typo
2011-02-04 16:35:07 +00:00
Colin Watson
8c2c4ff2f5
Handle empty dir passed to grub_find_root_device_from_mountinfo; fixes grub-mkrelpath on btrfs subvolumes.
2011-02-04 13:33:16 +00:00
Colin Watson
118fb264ee
Support probing multipath disks.
2011-01-25 16:51:23 +00:00
Colin Watson
307ed0b484
remove unused variables
2011-01-25 12:28:11 +00:00
Vladimir 'phcoder' Serbinenko
a9fa2a22d7
Integrate Fuloong firmware port into build system and grub-mkimage
2011-01-24 02:20:04 +01:00
Vladimir 'phcoder' Serbinenko
dc1c21edb7
Add informative #define
2011-01-24 01:49:25 +01:00
Vladimir 'phcoder' Serbinenko
88906eaa69
Fix accidental disable of Geode UARTs
2011-01-24 01:46:00 +01:00
Vladimir 'phcoder' Serbinenko
44626c910e
Add fuloong registers for RAM controller
2011-01-24 01:45:11 +01:00
Vladimir 'phcoder' Serbinenko
c69ef8a0ab
pass machine type from fwstart.S. Minor cleanup
2011-01-24 00:40:59 +01:00
Vladimir 'phcoder' Serbinenko
5ea788ada0
Geode UART2 (for Fuloong) fwstart.img support
2011-01-24 00:40:03 +01:00
Vladimir 'phcoder' Serbinenko
1ccfc5d201
Move GPIO init to fwstart.S for convenience
2011-01-24 00:38:30 +01:00
Vladimir 'phcoder' Serbinenko
0889c3401c
Explicitly enable MSR mailbox
2011-01-23 21:56:00 +01:00
Vladimir 'phcoder' Serbinenko
9b4ad415e6
Retry the scan for CS5536 in case of failure
2011-01-23 21:52:43 +01:00
Vladimir 'phcoder' Serbinenko
ea9e017dc5
Correct address to unsupported memory type string
2011-01-23 21:50:09 +01:00
Vladimir 'phcoder' Serbinenko
3533413cd5
* grub-core/kern/emu/getroot.c: Include config-util.h explicitly.
2011-01-22 15:37:05 +01:00
Anthony DeRobertis
5d4c5f8914
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Check
...
super_offset field.
2011-01-22 15:20:08 +01:00
Vladimir 'phcoder' Serbinenko
03a4ccb513
* grub-core/bus/bonito.c (write_bases): Fix direction of the shift.
2011-01-22 14:26:18 +01:00
Vladimir 'phcoder' Serbinenko
ffc8f4d8bc
* grub-core/partmap/bsdlabel.c: Include grub/emu/misc.h and not grub/util/misc.h.
...
(iterate_real): Don't rely on partition being non-NULL.
2011-01-22 14:15:17 +01:00
Vladimir 'phcoder' Serbinenko
80f23be71f
* grub-core/script/argv.c (round_up_exp): unsigned is 32-bit on all
...
supported platforms. Put a compile time assert for this rather than
generate a warning with 32-bit shift.
2011-01-22 14:11:19 +01:00
Vladimir 'phcoder' Serbinenko
5d4f4dd51b
* grub-core/disk/scsi.c (grub_scsi_read): Fix binary and check and make
...
logical expression more readable.
2011-01-22 13:22:46 +01:00
Vladimir 'phcoder' Serbinenko
e489601ad0
* grub-core/disk/raid.c (insert_array): Ensure uniqueness of p->number
...
even if some elements have a name.
Reported by: Alexander GQ Gerasiov.
2011-01-22 13:18:05 +01:00
Vladimir 'phcoder' Serbinenko
99388e0cf8
Fuloong shutdown support
2011-01-18 19:39:12 +01:00
Vladimir 'phcoder' Serbinenko
cfe6539cfe
initialise keylayout on fuloong too
2011-01-18 19:05:12 +01:00
Vladimir 'phcoder' Serbinenko
8f49d04c98
machtype autodetection
2011-01-18 19:04:27 +01:00
Vladimir 'phcoder' Serbinenko
74eea126f4
fuloong support
2011-01-18 15:28:44 +01:00
Vladimir 'phcoder' Serbinenko
edf9d1f7eb
Don't double the divisor on Geode UART, it runs at normal speed
2011-01-18 14:00:55 +01:00
Vladimir 'phcoder' Serbinenko
01b08a0f15
initial SIS315PRO support
2011-01-18 13:44:16 +01:00
Colin Watson
9b300caf84
grub_video_get_edid is not usable from grub_vbe_get_preferred_mode, as a
...
video adapter has not necessarily yet been set. Use grub_video_vbe_get_edid
and grub_video_edid_checksum directly instead. Remove grub_video_get_edid
as it now has no users.
Reported by: Marjo Mercado.
2011-01-17 12:07:47 +00:00
Colin Watson
cb918eddf4
fix FP info handling
2011-01-17 12:05:12 +00:00
Colin Watson
4f8ba1461b
Use low memory scratch area for EDID and FP calls.
2011-01-17 11:56:36 +00:00
Colin Watson
13fc463f17
Make new grub_vbe_bios_* functions static.
2011-01-15 14:18:16 -06:00
Vladimir 'phcoder' Serbinenko
46c9db88cd
* grub-core/kern/mips/yeeloong/init.c (grub_machine_init): Init boot
...
module.
2011-01-14 19:23:34 +01:00
Vladimir 'phcoder' Serbinenko
1d955d0098
* grub-core/Makefile.core.def (fwstart): Add lost LDFLAGS.
2011-01-14 19:21:06 +01:00
Vladimir 'phcoder' Serbinenko
f440c33fd2
Make qemu-mips compile again. Still no grub-mkimage support
2011-01-14 17:37:11 +01:00
Vladimir 'phcoder' Serbinenko
4fbf185232
* grub-core/fs/zfs/zfsinfo.c (grub_cmd_zfs_bootfs): Quote bootpath and
...
diskdevid.
2011-01-13 22:25:56 +01:00
Vladimir 'phcoder' Serbinenko
f1632d4dd0
Fix compilation on cygwin.
...
* conf/Makefile.common (STRIPFLAGS_KERNEL): Add -F elf32-i386 and
-R .drectve on cygwin.
* conf/i386-pc-cygwin-img-ld.sc: Merge rdata and pdata into data.
* configure.ac: Use $(top_builddir) in TARGET_OBJ2ELF.
(COND_CYGWIN): New condition.
* grub-core/Makefile.am (%.mod): Set TARGET_OBJ2ELF.
* grub-core/genmod.sh.in: Use ${TARGET_OBJ2ELF} and
not @TARGET_OBJ2ELF@.
* util/grub-pe2elf.c (write_symbol_table): Use pe_symtab->type and not
type to determine whether aux is to be used.
2011-01-13 22:23:49 +01:00
Colin Watson
bd1a414714
Resolve the device returned by grub_find_root_device_from_mountinfo or
...
find_root_device_from_libzfs using grub_find_device.
Reported by: Roderich Schupp.
2011-01-12 17:27:52 -06:00
Vladimir 'phcoder' Serbinenko
8fc0a24576
* grub-core/Makefile.core.def (ieee1275_fb): Disable on sparc.
...
It doesn't work well there.
2011-01-12 11:55:52 +01:00
Vladimir 'phcoder' Serbinenko
b8494fbe5c
* grub-core/normal/context.c (grub_env_context_close): Silence spurious
...
warning.
* grub-core/normal/menu.c (grub_menu_execute_entry): Likewise.
* grub-core/partmap/msdos.c (pc_partition_map_embed): Use unsigned
counter.
2011-01-12 11:52:51 +01:00
Vladimir 'phcoder' Serbinenko
b44a558c9a
Use alias->path rather than buggy "canon".
...
* grub-core/disk/ieee1275/ofdisk.c (ofdisk_hash_add_real): New function.
(ofdisk_hash_add): New argument curcan. All users updated.
2011-01-12 11:26:28 +01:00
Vladimir 'phcoder' Serbinenko
9da068a5dc
* grub-core/loader/powerpc/ieee1275/linux.c (grub_linux_load32): Apply
...
loadmask before doing any calculations. Use correct type for offset.
(grub_linux_load64): Likewise.
2011-01-11 23:01:07 +01:00
Colin Watson
6b978c4f04
merge trunk
2011-01-11 10:00:45 -06:00
Vladimir 'phcoder' Serbinenko
4531a206a1
* grub-core/fs/i386/pc/pxe.c (set_mac_env): Export variable.
...
(set_env_limn_ro): Likewise.
(GRUB_MOD_INIT): Likewise.
* grub-core/hook/datehook.c (GRUB_MOD_INIT): Likewise. Change to
ARRAY_SIZE while on it.
(GRUB_MOD_FINI): Change to ARRAY_SIZE.
* grub-core/normal/context.c (grub_env_export): Move from here ...
* grub-core/kern/env.c (grub_env_export): ... here.
* grub-core/normal/context.c (grub_cmd_export): Skip exporting root and
prefix.
* grub-core/kern/main.c (grub_main): Export root and prefix.
* include/grub/env.h (grub_env_export): Export.
Reported by: Seth Goldberg.
2011-01-11 11:51:05 +01:00
Vladimir 'phcoder' Serbinenko
4514605726
* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_make_mbi):
...
Take into account space used by ELF sections and multiboot palette.
Reported by: Grégoire Sutre.
2011-01-11 00:44:56 +01:00
Vladimir 'phcoder' Serbinenko
3395fe5230
Pass more appropriate video id to Linux.
...
* grub-core/loader/i386/linux.c (grub_linux_setup_video): Use
grub_video_get_driver_id and variable gfxpayloadforcelfb to
fill have_vga.
(grub_linux_boot): Rely on grub_linux_setup_video to fill have_vga and
shift params->lfb_size.
* include/grub/i386/linux.h: Make an enume out of have_vga values.
2011-01-11 00:02:01 +01:00
Vladimir 'phcoder' Serbinenko
b3ff6ff056
* grub-core/fs/zfs/zfsinfo.c (grub_cmd_zfs_bootfs): Use comma as
...
separator and pass bootpath/devid even if only one of them is available.
Reported by: Seth Goldberg.
2011-01-10 23:56:11 +01:00
Vladimir 'phcoder' Serbinenko
ae67942e78
Don't use post-4G memory on EFI even if 64-bit since some non-compliant
...
implementations bug on them.
* grub-core/kern/efi/mm.c (grub_efi_allocate_pages): Skip post-4G
memory.
(filter_memory_map): Likewise.
2011-01-10 23:51:10 +01:00
Vladimir 'phcoder' Serbinenko
dcb883b162
Submenu default support.
...
* grub-core/normal/menu.c (grub_menu_execute_entry): New parameter
auto_boot. All users updated.
Declared static.
Handle chosen and default with submenus.
(grub_menu_execute_with_fallback): Declared static.
Don't notify failure if autobooted. Upper level does it.
(menuentry_eq): New function.
(get_entry_number): Use menuentry_eq.
(show_menu): New parameter "autobooted". All users updated.
(grub_show_menu): Likewise.
* include/grub/normal.h (grub_show_menu): Likewise.
* include/grub/menu.h (grub_menu_execute_entry): Removed.
(grub_menu_execute_with_fallback): Likewise.
2011-01-10 23:27:58 +01:00
Vladimir 'phcoder' Serbinenko
47a77af5e8
* grub-core/commands/legacycfg.c (legacy_file): Trim the line.
2011-01-10 19:25:00 +01:00
Vladimir 'phcoder' Serbinenko
db87be2aea
* grub-core/kern/i386/pc/init.c (grub_get_conv_memsize): Removed.
...
(grub_machine_init): Don't check amount of low memory as reportedly
INT 12h can be broken and if low memory is too low we wouldn't have
gotten into grub_machine_init anyway.
2011-01-10 17:54:21 +01:00
Vladimir 'phcoder' Serbinenko
c49849cc63
* grub-core/kern/i386/pc/mmap.c (grub_get_conv_memsize): New function.
...
(grub_machine_mmap_iterate): Take low memory into account
2011-01-10 17:51:06 +01:00
Vladimir 'phcoder' Serbinenko
b1969b3049
* grub-core/fs/btrfs.c (grub_btrfs_mount): Transform out of range into
...
badfs.
Reported by: TiCPU.
2011-01-10 17:35:32 +01:00
Vladimir 'phcoder' Serbinenko
cf0eaf13a1
* grub-core/disk/raid.c (insert_array): Display RAID name in duplicate
...
members errors.
2011-01-10 17:28:29 +01:00
Vladimir 'phcoder' Serbinenko
4b07826647
partitioned mdraid support (untested)
2011-01-08 16:33:49 +01:00
Vladimir 'phcoder' Serbinenko
e7121b6932
* grub-core/fs/zfs/zfs.c (dmu_read): Use void * for some pointers to
...
avoid aliasing.
(fzap_lookup): Likewise.
(dnode_get): Likewise.
(make_mdn): Likewise.
(zfs_mount): Likewise.
(fzap_iterate): Use temporary pointer to avoid aliasing.
(grub_zfs_read): Likewise.
* grub-core/loader/i386/xnu.c (grub_xnu_boot): Likewise.
* grub-core/loader/xnu.c (grub_cmd_xnu_kernel): Use void * for some
pointers to avoid aliasing.
(grub_cmd_xnu_kernel64): Likewise.
(grub_xnu_load_driver): Likewise.
2011-01-08 01:56:09 +01:00
Vladimir 'phcoder' Serbinenko
fc836af9a5
* grub-core/commands/terminal.c (grub_cmd_terminal_input): Silence
...
aliasing warning.
(grub_cmd_terminal_output): Likewise.
Reported and tested by: Grégoire Sutre.
2011-01-08 01:50:06 +01:00
Vladimir 'phcoder' Serbinenko
f9f376488b
* grub-core/term/at_keyboard.c (grub_keyboard_getkey): Silence spurious
...
warning.
Reported and tested by: Grégoire Sutre.
2011-01-08 01:45:57 +01:00
Vladimir 'phcoder' Serbinenko
9462775a2d
* grub-core/Makefile.am (rs_decoder.S): Force compilation with -Os.
...
Reported and tested by: Alain Greppin.
2011-01-08 00:39:12 +01:00
Vladimir 'phcoder' Serbinenko
0fd48e357f
Satisfy some bison versions need for inttypes.h.
...
* grub-core/lib/posix_wrap/inttypes.h: New file.
* grub-core/lib/posix_wrap/sys/types.h (int8_t): New type.
(int16_t): Likewise.
(int32_t): Likewise.
(int64_t): Likewise.
Reported and tested by: Alain Greppin.
2011-01-08 00:34:23 +01:00
Vladimir 'phcoder' Serbinenko
43f1bc8369
* grub-core/loader/i386/bsdXX.c (grub_netbsd_load_elf_meta):
...
Silence spurious warning.
Reported and tested by: Alain Greppin.
2011-01-08 00:27:38 +01:00
Colin Watson
b7d86d53c4
merge trunk
2011-01-07 17:26:15 +00:00
Colin Watson
11b970d7c9
Always initialise *relroot in grub_find_root_device_from_mountinfo,
...
otherwise we free an uninitialised pointer if /proc is unmounted.
Reported by: Scott Moser.
2011-01-07 17:24:25 +00:00
Szymon Janc
25953e1055
Improve loaders' kernel command line handling.
...
* grub-core/lib/cmdline.c: New file.
* include/grub/lib/cmdline.h: Likewise.
* grub-core/loader/i386/linux.c (grub_cmd_linux): Use
grub_create_loader_cmdline to create kernel command line.
* grub-core/loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
* grub-core/loader/powerpc/ieee1275/linux.c (grub_cmd_linux): Likewise.
* grub-core/loader/sparc64/ieee1275/linux.c (grub_cmd_linux): Likewise.
* grub-core/Makefile.core.def (linux16): Add lib/cmdline.c on i386_pc.
(linux): Add lib/cmdline.c on common.
2011-01-07 17:09:39 +01:00
Vladimir 'phcoder' Serbinenko
e72d259fe1
* grub-core/fs/xfs.c (grub_xfs_iterate_dir): Take into account that
...
inopos might be unaligned.
2011-01-07 17:06:42 +01:00
Vladimir 'phcoder' Serbinenko
c0cf26da6b
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Add missing
...
endian transformations.
* grub-core/disk/mdraid_linux.c (grub_mdraid_detect): Likewise.
Based on report by: Doug Nazar.
2011-01-07 16:17:24 +01:00
Doug Nazar
0ca09e6c52
* grub-core/disk/raid5_recover.c (grub_raid5_recover): Add missing
...
array->members[i].start_sector.
* grub-core/disk/raid6_recover.c (grub_raid6_recover): Likewise.
2011-01-07 14:41:44 +01:00
Colin Watson
6383772c92
remove unused variable
2011-01-06 18:08:01 +00:00
Colin Watson
71b6a2b7a2
* grub-core/kern/emu/getroot.c (find_root_device_from_mountinfo):
...
Fix prefix check to handle the case where dir ends with a slash
(most significantly, "/" itself).
Reported by: Michael Vogt.
2011-01-06 11:09:17 +00:00
Colin Watson
304e349b7f
include <grub/emu/getroot.h> for grub_find_device
2011-01-05 11:41:12 +00:00
Vladimir 'phcoder' Serbinenko
b3f8d28ad0
Run terminfo_cls on initing terminfo output to clear the screen and
...
move the cursor to (0,0).
* grub-core/term/ieee1275/ofconsole.c (grub_ofconsole_init_output):
Call grub_terminfo_output_init.
* grub-core/term/serial.c (grub_serial_term_output): Set .init.
* grub-core/term/terminfo.c (grub_terminfo_output_init): New function.
* include/grub/terminfo.h (grub_terminfo_output_init): New declaration.
2011-01-05 12:23:06 +01:00
Vladimir 'phcoder' Serbinenko
488f71f116
* grub-core/term/terminfo.c (grub_terminfo_readkey): Handle keys with
...
CTRL.
2011-01-05 01:25:01 +01:00
Vladimir 'phcoder' Serbinenko
18a38098ad
The E820 type 5 is BADRAM, not EXEC_CODE.
...
* grub-core/loader/i386/bsd.c (GRUB_E820_EXEC_CODE): Removed.
(GRUB_E820_BADRAM): New define.
* grub-core/loader/i386/linux.c (grub_linux_boot): Translate code
into reserved. Propagate BADRAM.
* grub-core/loader/i386/bsd.c (GRUB_E820_EXEC_CODE): Removed.
(GRUB_E820_BADRAM): New define.
2011-01-05 01:14:32 +01:00
Vladimir 'phcoder' Serbinenko
9eae2084f4
* grub-core/lib/efi/relocator.c (grub_relocator_firmware_fill_events):
...
Ignore the memory post-4G.
(grub_relocator_firmware_alloc_region): Additional debug statement.
2011-01-04 19:08:03 +01:00
Vladimir 'phcoder' Serbinenko
ebc71d284c
* grub-core/kern/emu/getroot.c (grub_util_get_grub_dev): Check md/%s
...
names.
Reported by: David Pravec.
2011-01-04 18:15:27 +01:00
Colin Watson
92882f28b6
merge trunk
2011-01-04 15:51:41 +00:00
Colin Watson
944404efb8
merge trunk
2011-01-04 15:41:07 +00:00
Vladimir 'phcoder' Serbinenko
446fa40081
* grub-core/disk/i386/pc/biosdisk.c (GRUB_MOD_INIT): Workaround buggy
...
BIOSes.
2011-01-04 15:42:47 +01:00
Vladimir 'phcoder' Serbinenko
a0159f370d
* grub-core/lib/reed_solomon.c (grub_reed_solomon_add_redundancy):
...
Prevent overflow.
(grub_reed_solomon_recover): Likewise.
2011-01-04 15:39:59 +01:00
Vladimir 'phcoder' Serbinenko
e5146ca18b
* grub-core/lib/reed_solomon.c (main) [TEST]: Reactivate normal test.
2011-01-04 15:37:10 +01:00
Vladimir 'phcoder' Serbinenko
956384994b
* grub-core/lib/reed_solomon.c (scratch) [! STANDALONE]: Remove leftover
...
variable.
2011-01-04 15:35:10 +01:00
Colin Watson
5b1bdf1231
* grub-core/commands/legacycfg.c (GRUB_MOD_INIT): Fix typo in
...
descriptions of extract_legacy_entries_source and
extract_legacy_entries_configfile.
Reported by: Seung Soo, Ha.
2011-01-04 13:05:19 +00:00
Colin Watson
99d925aad4
* grub-core/bus/pci.c (grub_pci_iterate): Skip remaining functions
...
on devices that do not implement function 0.
2011-01-03 23:56:45 +00:00
Vladimir 'phcoder' Serbinenko
092fd3a072
merge mainline into ahci
2011-01-03 16:03:13 +01:00
Vladimir 'phcoder' Serbinenko
7a1d4deec9
Fix finalisation/restore
2011-01-03 15:59:20 +01:00
Vladimir 'phcoder' Serbinenko
fb7ab4a99b
add missing == 0
2011-01-03 15:54:59 +01:00
Dave Vasilevsky
4af0504b72
* grub-core/fs/hfsplus.c: Make parent unsigned.
...
(grub_hfsplus_cmp_catkey): Don't compare using subtraction, it
overflows.
(grub_hfsplus_cmp_extkey): Likewise
2011-01-03 15:30:41 +01:00
phcoder
bea3358389
First handling of ia64-efi in grub-mkimage
2011-01-03 13:46:36 +01:00
phcoder
c18271ed00
Fix compilation errors
2011-01-03 02:28:14 +01:00
Vladimir 'phcoder' Serbinenko
0718f66d12
Discard a bunch of junk code
2011-01-03 00:56:28 +01:00
phcoder
5faa440cb0
Discard several spurious differences from mainline
2011-01-03 00:47:21 +01:00
phcoder
0a2b2cdc95
Fix autogen
2011-01-03 00:30:26 +01:00
Vladimir 'phcoder' Serbinenko
0f35c665e6
merge mainline to ia64
2011-01-03 00:04:39 +01:00
Vladimir 'phcoder' Serbinenko
7edf63fce6
merge ia64-emu into ia64
2011-01-02 23:55:50 +01:00
phcoder
f49157dfe5
Restructure module loading and many fixes. Now normal.mod loads successfully
2011-01-02 23:30:25 +01:00
phcoder
bbbf84350e
Working hello.mod with extcmd.mod
2011-01-02 19:20:28 +01:00
phcoder
73911575dd
support for registering functions from modules (not tested yet)
2011-01-02 14:58:57 +01:00
phcoder
daca6c5f45
ltoff relocation support
2011-01-02 14:39:23 +01:00
phcoder
f9c30af6d0
Succesfully loaded return-only module on ia64-emu
2011-01-02 14:09:58 +01:00
Vladimir 'phcoder' Serbinenko
6f49d0aacb
Add missing cache.c
2011-01-01 15:53:31 +01:00
Vladimir 'phcoder' Serbinenko
3a04c65d00
Always add libgcc.h
2011-01-01 15:13:03 +01:00
Vladimir 'phcoder' Serbinenko
fb17547ca8
Check amiga partmap checksum
2010-12-31 15:23:06 +01:00
Vladimir 'phcoder' Serbinenko
b9cd13659c
Simplify the AFFS checksum computation.
2010-12-31 15:22:36 +01:00
Vladimir 'phcoder' Serbinenko
abafac997c
merge mainline into filesys
2010-12-31 15:05:55 +01:00
Vladimir 'phcoder' Serbinenko
2f70097d3e
merge mainline into filesys branch
2010-12-31 15:02:07 +01:00
Vladimir 'phcoder' Serbinenko
275bff5f00
* grub-core/partmap/amiga.c (GRUB_AMIGA_PART_MAGIC): New define.
...
(amiga_partition_map_iterate): Check "PART" magic to avoid a very long
loop in case of incorrect amiga partmap.
2010-12-31 15:00:45 +01:00
Vladimir 'phcoder' Serbinenko
307806cb53
* grub-core/partmap/amiga.c (GRUB_AMIGA_RDSK_MAGIC): New define.
...
(amiga_partition_map_iterate): Use grub_memcmp instead of grub_strcmp.
Reported by:EHeM.
2010-12-31 14:55:55 +01:00
Vladimir 'phcoder' Serbinenko
b12b923e63
* grub-core/loader/i386/bsdXX.c (grub_openbsd_find_ramdisk): Silence
...
spurious warning.
Reported by: crocket
2010-12-31 12:37:35 +01:00
Vladimir 'phcoder' Serbinenko
14b48a19c2
* grub-core/loader/xnu.c (grub_cmd_xnu_kernel) [! GRUB_MACHINE_EFI]:
...
Preload EFIemu.
(grub_cmd_xnu_kernel64) [! GRUB_MACHINE_EFI]: Likewise.
2010-12-27 07:19:51 +01:00
Vladimir 'phcoder' Serbinenko
693db2df56
* grub-core/loader/xnu.c (grub_cmd_xnu_kext): Abort if no kernel
...
is loaded
(grub_cmd_xnu_kextdir): Likewise.
(grub_cmd_xnu_splash): Likewise.
2010-12-27 07:18:24 +01:00
Vladimir 'phcoder' Serbinenko
c76386454e
Avoid using Reed-Solomon with 0 redundancy.
...
* grub-core/kern/i386/pc/startup.S: Remove 0-data check.
* grub-core/lib/reed_solomon.c (decode_block): Do not proceed on 0 data
or 0 redundancy.
(grub_reed_solomon_add_redundancy): Do not proceed with 0 redundancy.
(grub_reed_solomon_recover): Likewise.
2010-12-27 07:09:43 +01:00
Vladimir 'phcoder' Serbinenko
25dd47804d
Don't use disk subsystem in freebsd_boot.
...
* grub-core/loader/i386/bsd.c (freebsd_bootdev): New variable.
(freebsd_biosdev): Likewise.
(grub_freebsd_boot): Use freebsd_bootdev and freebsd_biosdev.
(grub_cmd_freebsd): Set freebsd_bootdev and freebsd_biosdev.
2010-12-27 07:06:41 +01:00
Vladimir 'phcoder' Serbinenko
0b2db94300
Handling of files of unknown size is currently limited. They can't be
...
used e.g. for initrd or modules. Moreover gzip handling of not
easily seekable files is buggy. Disable unknown file size for now. May
be inefficient but works.
* grub-core/io/gzio.c (test_header): Always retrieve the file size.
* grub-core/io/xzio.c (grub_xzio_open): Likewise.
2010-12-26 21:15:31 +01:00
Mirko Parthey
5c408d0f50
* grub-core/boot/i386/pc/boot.S: Fix %es:%bx pointing to nowhere on
...
floppy probe.
2010-12-26 20:49:08 +01:00
Vladimir 'phcoder' Serbinenko
3d5f359d3b
merge mainline into ahci
2010-12-26 11:20:12 +01:00
Vladimir 'phcoder' Serbinenko
af36812f5c
fix a compilation error
2010-12-26 00:57:03 +01:00
Vladimir 'phcoder' Serbinenko
b28fd807eb
freedos support
2010-12-26 00:38:20 +01:00
Jeroen Dekkers
190a011a8b
* grub-core/disk/raid.c (insert_array): Don't add spurious members.
2010-12-25 22:32:54 +01:00
Shea Levy
022d01b807
* grub-core/genmod.sh.in: Use @OBJCOPY@ rather than objcopy.
2010-12-25 18:21:46 +01:00
Vladimir 'phcoder' Serbinenko
9797178671
Accept ports in state 1
2010-12-25 18:02:43 +01:00
Vladimir 'phcoder' Serbinenko
c76ae9b4da
set parms.write on disk write
2010-12-25 17:40:00 +01:00
Vladimir 'phcoder' Serbinenko
3c51ecb82b
Fix adressing mode mismatch
2010-12-25 15:47:23 +01:00
Vladimir 'phcoder' Serbinenko
0354b8672c
* grub-core/commands/acpihalt.c (grub_acpi_halt): Sleep for 1.5 before
...
writing an error message because of async power management.
* grub-core/kern/mips/yeeloong/init.c (grub_halt): Likewise.
(grub_reboot): Likewise.
2010-12-25 14:09:36 +01:00
Vladimir 'phcoder' Serbinenko
3bce4450b3
avoid throwing data away on pxefs_open. Reported by : Seth Goldberg
2010-12-25 13:44:31 +01:00
Vladimir 'phcoder' Serbinenko
d1e517eb20
extend --disk-module to AHCI and USB
2010-12-25 12:11:54 +01:00
Vladimir 'phcoder' Serbinenko
d9675dbee3
Move 0xE0 to callers rather than to have it in drivers
2010-12-25 03:47:51 +01:00
Vladimir 'phcoder' Serbinenko
a934071d76
Remove unused pata ioaddress2
2010-12-25 03:22:12 +01:00
Vladimir 'phcoder' Serbinenko
188ac234bd
use DMA for AHCI commands
2010-12-25 03:12:49 +01:00
Vladimir 'phcoder' Serbinenko
060d0c7ac2
working AHCI (at last)
2010-12-25 03:06:07 +01:00
Vladimir 'phcoder' Serbinenko
51f7e1acb7
DMA ATA commands support
2010-12-25 02:53:20 +01:00
Vladimir 'phcoder' Serbinenko
908a8fc37a
Fix several AHCI problems
2010-12-24 19:48:55 +01:00
Vladimir 'phcoder' Serbinenko
ee2b985ef6
rearrange wait_not_busy
2010-12-24 17:11:21 +01:00
Vladimir 'phcoder' Serbinenko
8f5ac9e570
fix ATAPI support
2010-12-24 17:10:41 +01:00
Vladimir 'phcoder' Serbinenko
22a7cc9a6f
fix 3rd argument to scsi_iterate
2010-12-24 17:09:56 +01:00
Vladimir 'phcoder' Serbinenko
faec81d97d
Add missing buffer specifications
2010-12-24 16:54:33 +01:00
Vladimir 'phcoder' Serbinenko
de2690be7c
merge mainline into ahci
2010-12-24 16:16:01 +01:00
Colin Watson
e925b2b6d4
merge parse-color
2010-12-23 12:22:20 +00:00
Colin Watson
6d46121efb
merge trunk
2010-12-23 12:20:48 +00:00
Colin Watson
af4e4a875a
return GRUB_ERR_NONE instead of setting grub_errno
2010-12-23 12:19:55 +00:00
Colin Watson
1c95b6d2bf
Move video/colors.c into video.mod.
2010-12-23 12:11:44 +00:00
Colin Watson
20641b6baa
* grub-core/lib/reed_solomon.c (gauss_solve): Fix size of standalone
...
scratch area. Make sure to initialise chosen in standalone mode as
well as non-standalone.
Reported by: Robert Hooker and Andy Whitcroft.
Tested by: Andy Whitcroft.
2010-12-21 16:51:08 +00:00
Colin Watson
d060ad60ee
* grub-core/commands/echo.c (grub_cmd_echo): Make UTF-8-clean by
...
constructing a new unescaped string and passing it to grub_xputs in
one go, rather than passing characters to grub_printf one at a time.
2010-12-21 13:52:07 +00:00
Colin Watson
b889cfadf9
* grub-core/fs/udf.c (read_string): Pacify GCC warning by
...
initialising utf16.
2010-12-21 13:00:10 +00:00
Vladimir 'phcoder' Serbinenko
5318fe9804
* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_add_module):
...
Avoid next pointing to nowhere.
2010-12-20 16:13:01 +01:00
Vladimir 'phcoder' Serbinenko
052677ba71
merge mainline into filesys
2010-12-19 00:54:05 +01:00