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
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
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
Vladimir 'phcoder' Serbinenko
6c85b743f5
* grub-core/fs/affs.c (grub_affs_mount): Read data->bblock.rootblock
...
rather than assuming than rootblock is exactly in the middle.
(grub_affs_label): Likewise.
2010-12-19 00:52:18 +01:00
Vladimir 'phcoder' Serbinenko
b070525d03
* grub-core/fs/affs.c (grub_affs_mount): Read data->bblock.rootblock
...
rather than assuming than rootblock is exactly in the middle.
(grub_affs_label): Likewise.
2010-12-19 00:52:18 +01:00
Vladimir 'phcoder' Serbinenko
a2a08a35bf
* grub-core/fs/affs.c (grub_affs_fs) [GRUB_UTIL]: Explicitly set
...
reserved_first_sector to 0.
* grub-core/fs/cpio.c (grub_cpio_fs) [GRUB_UTIL]: Likewise.
* grub-core/fs/sfs.c (grub_sfs_fs) [GRUB_UTIL]: Likewise.
* grub-core/fs/xfs.c (grub_xfs_fs) [GRUB_UTIL]: Likewise.
2010-12-19 00:49:52 +01:00
Vladimir 'phcoder' Serbinenko
b85812b06f
* grub-core/fs/affs.c (grub_affs_fs) [GRUB_UTIL]: Explicitly set
...
reserved_first_sector to 0.
* grub-core/fs/cpio.c (grub_cpio_fs) [GRUB_UTIL]: Likewise.
* grub-core/fs/sfs.c (grub_sfs_fs) [GRUB_UTIL]: Likewise.
* grub-core/fs/xfs.c (grub_xfs_fs) [GRUB_UTIL]: Likewise.
2010-12-19 00:49:52 +01:00
Vladimir 'phcoder' Serbinenko
7059d1ec14
Fix handling of UTF-16 UDF labels.
...
* grub-core/fs/udf.c (grub_udf_iterate_dir): Move string-parsing part
(read_string): .. here.
(grub_udf_label): Use read_string.
2010-12-19 00:43:41 +01:00
Vladimir 'phcoder' Serbinenko
e6533ae154
Fix handling of UTF-16 UDF labels.
...
* grub-core/fs/udf.c (grub_udf_iterate_dir): Move string-parsing part
(read_string): .. here.
(grub_udf_label): Use read_string.
2010-12-19 00:43:41 +01:00
BVK Chaitanya
fcf983f8c7
merge with mainline
2010-12-19 09:17:22 +05:30
Colin Watson
32570200a8
* grub-core/normal/term.c (print_more): Make \r or \n scroll one
...
line, and other keys scroll an entire page (previous handling was
for \r and \n to scroll a page and other keys to scroll two lines).
2010-12-18 17:37:48 +00:00
Vladimir 'phcoder' Serbinenko
e1dffcf270
* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_make_mbi):
...
Set ptrdest to correct get_physical_target_address rather than
incorrect get_virtual_current_address.
2010-12-18 14:31:05 +01:00
kashyap garimella
b04298cfa2
* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_load): Use
...
correct cat to grub_uint8_t * rather than grub_uint32_t *.
2010-12-18 15:22:11 +01:00
Vladimir 'phcoder' Serbinenko
4493254156
Support RomFS label
2010-12-15 22:00:18 +01:00
Vladimir 'phcoder' Serbinenko
20af857581
symlink support on romfs
2010-12-15 20:36:54 +01:00
Vladimir 'phcoder' Serbinenko
921c7932d0
directory and hardlink support on romfs
2010-12-15 20:24:16 +01:00
Vladimir 'phcoder' Serbinenko
29184e9312
romfs support
2010-12-15 19:49:35 +01:00
Colin Watson
477343c86e
make sure virtual_screen.bg_color is compatible with the text layer
2010-12-15 01:31:07 +00:00
Colin Watson
159b4a8bb7
(redraw_screen_rect): Allow blend/replace of text layer to be
...
controlled independently from whether there is a background bitmap.
(grub_gfxterm_fullscreen): Change blend_text_bg when changing
bitmap.
(destroy_window): Likewise.
(grub_gfxterm_background_image_cmd): Likewise.
2010-12-14 12:28:36 +00:00
Colin Watson
198cae0c96
Fix border repainting.
...
* grub-core/term/gfxterm.c (dirty_region_add): When a repaint is
already scheduled, merge the virtual screen with the requested
region rather than repainting only the virtual screen.
2010-12-13 13:58:53 +00:00
Vladimir 'phcoder' Serbinenko
0e5507c411
mtime support for ntfs
2010-12-12 01:00:33 +01:00
Vladimir 'phcoder' Serbinenko
7b32d83d78
SFS mtime support
2010-12-11 22:48:29 +01:00
Vladimir 'phcoder' Serbinenko
bd1de4341b
explicitly declare SFS as not installable
2010-12-11 22:33:34 +01:00
Vladimir 'phcoder' Serbinenko
790aaa8c9f
AFFS mtime support
2010-12-11 22:02:22 +01:00
Vladimir 'phcoder' Serbinenko
e21c356413
restructure AFFS fshelp_node-related code
2010-12-11 21:59:22 +01:00
Vladimir 'phcoder' Serbinenko
9959c6a70b
Fix AFFS rootblock detection
2010-12-11 21:15:25 +01:00
Vladimir 'phcoder' Serbinenko
81ecffbfc1
Add missing packed attribute
2010-12-11 18:42:44 +01:00
Vladimir 'phcoder' Serbinenko
5e96cb4452
Extend few other fields
2010-12-11 18:41:42 +01:00
Vladimir 'phcoder' Serbinenko
ea17ec49ae
Extend fields in dirent header
2010-12-11 18:32:08 +01:00
Vladimir 'phcoder' Serbinenko
80113a6258
declare AFFS, CPIO, TAR and XFS as non-installable explicitly
2010-12-11 18:21:39 +01:00
Vladimir 'phcoder' Serbinenko
4aab263130
SquashFS mtime support
2010-12-11 18:20:45 +01:00
Vladimir 'phcoder' Serbinenko
f5ff296240
minix mtime support
2010-12-11 17:46:16 +01:00
Vladimir 'phcoder' Serbinenko
7ac6c4842d
JFS mtime support
2010-12-11 14:26:34 +01:00
Vladimir 'phcoder' Serbinenko
58fa13fc7c
HFS mtime support
2010-12-11 07:15:44 +01:00
Vladimir 'phcoder' Serbinenko
ebec6850b9
HFS filesystem mtime support
2010-12-11 07:00:31 +01:00
Vladimir 'phcoder' Serbinenko
88db5b694a
file mtime support for reiserfs
2010-12-11 06:23:33 +01:00
Vladimir 'phcoder' Serbinenko
591baceb34
UDF symlink support
2010-12-11 06:04:21 +01:00
Colin Watson
9c55cbe8e7
Add a background_color command.
...
* grub-core/term/gfxterm.c (grub_gfxterm_background_color_cmd): New
function.
(GRUB_MOD_INIT): Register background_color command.
(GRUB_MOD_FINI): Unregister background_color command.
2010-12-10 17:47:38 +00:00
Vladimir 'phcoder' Serbinenko
f8e2e451e6
handle UTF16 UDF label
2010-12-10 18:34:46 +01:00
Colin Watson
52832c554c
Move gfxmenu color handling to video, so that gfxterm can use it
...
too.
* grub-core/gfxmenu/named_colors.c: Move to ...
* grub-core/video/colors.c: ... here. Rename
grub_gui_get_named_color to grub_video_get_named_color.
* grub-core/gfxmenu/gui_string_util.c (my_isxdigit): Move to ...
* grub-core/video/colors.c (my_isxdigit): ... here.
* grub-core/gfxmenu/gui_string_util.c (parse_hex_color_component):
Move to ...
* grub-core/video/colors.c (parse_hex_color_component): ... here.
* grub-core/gfxmenu/gui_string_util.c (grub_gui_parse_color): Move
to ...
* grub-core/video/colors.c (grub_video_parse_color): ... here.
* include/grub/gui.h (grub_gui_color_t): Move to ...
* include/grub/video.h (grub_video_rgba_color_t): ... here.
* include/grub/gui.h (grub_gui_color_rgb): Move to ...
* include/grub/video.h (grub_video_rgba_color_rgb): ... here.
* include/grub/gui.h (grub_gui_map_color): Move to ...
* include/grub/video.h (grub_video_map_rgba_color): ... here.
* include/grub/gui_string_util.h (grub_gui_get_named_color): Move
to ...
* include/grub/video.h (grub_video_get_named_color): ... here.
* include/grub/gui_string_util.h (grub_gui_parse_color): Move to ...
* include/grub/video.h (grub_video_parse_color): ... here.
* grub-core/Makefile.core.def (kernel) [videoinkernel]: Add
video/colors.c.
(gfxmenu): Remove gfxmenu/named_colors.c.
(video_colors) [videomodules]: New module, containing
video/colors.c.
2010-12-10 16:45:58 +00:00
Vladimir 'phcoder' Serbinenko
f22c12e852
mtime for UDF support
2010-12-10 17:37:32 +01:00
Vladimir 'phcoder' Serbinenko
5706da0443
mtime support for xfs
2010-12-10 16:19:24 +01:00
Vladimir 'phcoder' Serbinenko
3b95531920
fix unix range
2010-12-10 15:04:12 +01:00
Vladimir 'phcoder' Serbinenko
d6f07b29fc
mtime btrfs support
2010-12-10 14:38:16 +01:00
Colin Watson
1fb430f865
* grub-core/gettext/gettext.c (grub_gettext_init_ext): Factor out
...
.mo/.mo.gz opening sequence to ...
(grub_mofile_open_lang): ... here.
(grub_gettext_init_ext): If opening ll_CC fails, try ll.
* util/grub.d/00_header.in (grub_lang): Include country part of
locale.
Reported by: Mario Limonciello.
2010-12-10 11:45:08 +00:00
Vladimir 'phcoder' Serbinenko
c50d99c5e5
file mtime support for iso9660
2010-12-10 11:12:59 +01:00
Vladimir 'phcoder' Serbinenko
a2de6bf6ed
filesystem mtime support for iso9660
2010-12-10 10:32:50 +01:00
Vladimir 'phcoder' Serbinenko
db64f5b167
mtime support for cpio and tar
2010-12-10 08:42:40 +01:00
Vladimir 'phcoder' Serbinenko
4a91cd8220
symlink support
2010-12-09 22:29:36 +01:00
Vladimir 'phcoder' Serbinenko
e330e4f383
support file mtime
2010-12-09 21:17:27 +01:00
Vladimir 'phcoder' Serbinenko
627a62fc70
Make type-dependent portion of inode an union
2010-12-09 21:14:42 +01:00
Vladimir 'phcoder' Serbinenko
1fc7203971
Split grub_squash_read_data
2010-12-09 20:48:03 +01:00
Vladimir 'phcoder' Serbinenko
8eef1f8244
Compressed fragments and compressed data support
2010-12-09 20:41:41 +01:00
Vladimir 'phcoder' Serbinenko
e4eaf62555
Small restructuring of squash_read
2010-12-09 19:40:11 +01:00
Vladimir 'phcoder' Serbinenko
76e39dc871
Compressed metadata support
2010-12-09 19:23:35 +01:00
Vladimir 'phcoder' Serbinenko
99f0735fb8
Support multi-header directories
2010-12-09 18:22:38 +01:00
Vladimir 'phcoder' Serbinenko
948ebd7e91
Support fragments and chunks for data
2010-12-09 17:06:49 +01:00
Vladimir 'phcoder' Serbinenko
7ed6c3e85f
Honor chunk number for directories
2010-12-09 02:48:59 +01:00
Vladimir 'phcoder' Serbinenko
0a040470e5
determine root inode on squash4fs
2010-12-09 00:04:36 +01:00
Vladimir 'phcoder' Serbinenko
1deadc83f5
extend size to 32-bit and handle file->offset
2010-12-08 23:03:59 +01:00
Vladimir 'phcoder' Serbinenko
332fa36887
some squash4 code. Works only in very easy cases.
2010-12-08 21:22:46 +01:00
BVK Chaitanya
393324be7c
execute menu editor commands with argument scope
2010-12-08 16:43:11 +05:30
Vladimir 'phcoder' Serbinenko
79282228ec
use anopther RAID1(0) copy if main one fails
2010-12-06 20:26:49 +01:00
Colin Watson
24b7938b32
* grub-core/kern/i386/pc/startup.S (grub_console_getkey): Use `>> 1'
...
rather than `/ 2', as the latter requires -Wa,--divide which would
require bumping our minimum binutils version.
2010-12-04 16:19:26 +00:00
Vladimir 'phcoder' Serbinenko
3be8e5ea96
BtrFS zlib compression support
2010-12-03 21:42:13 +01:00
Vladimir 'phcoder' Serbinenko
6333f1e9b6
Add RAID10 support
2010-12-03 18:11:10 +01:00
Vladimir 'phcoder' Serbinenko
db51e201fc
symlink loop detection. btrfs-raid0 and raid1 support
2010-12-03 16:56:49 +01:00
Vladimir 'phcoder' Serbinenko
0e761d3dbd
Rename some btrfs variables for more uniformity
2010-12-03 11:30:24 +01:00
Vladimir 'phcoder' Serbinenko
34018a7d1f
symlink support
2010-12-03 10:44:47 +01:00
Vladimir 'phcoder' Serbinenko
a43c4bc55f
buffer extent for performance
2010-12-02 15:28:29 +01:00
Vladimir 'phcoder' Serbinenko
8006f6779e
Fix in-extent reading
2010-12-02 15:08:46 +01:00
Vladimir 'phcoder' Serbinenko
228cfb40bf
support bind and subvolume mount
2010-12-02 14:26:46 +01:00
Vladimir 'phcoder' Serbinenko
98042add0c
Fix handling of non-leaf next
2010-12-02 13:57:07 +01:00
Vladimir 'phcoder' Serbinenko
eb82b8569a
Remove leftover unused attribute
2010-12-02 13:32:24 +01:00
Vladimir 'phcoder' Serbinenko
d9865a25f7
Implicitly skip /default prefix
2010-12-02 13:31:50 +01:00
Vladimir 'phcoder' Serbinenko
93e0c7a7c2
Fix subvolume handling
2010-12-02 13:23:20 +01:00
Vladimir 'phcoder' Serbinenko
9b4cb862f8
handle directories correctly
2010-12-02 00:11:14 +01:00
Vladimir 'phcoder' Serbinenko
1f60e35331
initialise the type of search for root
2010-12-02 00:03:19 +01:00
Vladimir 'phcoder' Serbinenko
ac5dcabe67
Fix incorrect statement from previous commit
2010-12-01 23:16:19 +01:00
Vladimir 'phcoder' Serbinenko
a3d1fcfb10
Fix 2 warnings
2010-12-01 22:59:51 +01:00
Robert Millan
15abb5547f
Merge ZFS.
2010-12-01 22:57:49 +01:00
Robert Millan
54207d4b6c
Update GPL for ZFS code to version 3, move copyright lines for Vladimir and me to FSF (covered by our assignments)
2010-12-01 22:55:26 +01:00
Robert Millan
bf78d5b251
2010-12-01 Robert Millan <rmh@gnu.org>
...
* grub-core/fs/zfs/zfs.c: New file.
* grub-core/fs/zfs/zfs_fletcher.c: Likewise.
* grub-core/fs/zfs/zfs_lzjb.c: Likewise.
* grub-core/fs/zfs/zfs_sha256.c: Likewise.
* grub-core/fs/zfs/zfsinfo.c: Likewise.
* include/grub/zfs/dmu.h: Likewise.
* include/grub/zfs/dmu_objset.h: Likewise.
* include/grub/zfs/dnode.h: Likewise.
* include/grub/zfs/dsl_dataset.h: Likewise.
* include/grub/zfs/dsl_dir.h: Likewise.
* include/grub/zfs/sa_impl.h: Likewise.
* include/grub/zfs/spa.h: Likewise.
* include/grub/zfs/uberblock_impl.h: Likewise.
* include/grub/zfs/vdev_impl.h: Likewise.
* include/grub/zfs/zap_impl.h: Likewise.
* include/grub/zfs/zap_leaf.h: Likewise.
* include/grub/zfs/zfs.h: Likewise.
* include/grub/zfs/zfs_acl.h: Likewise.
* include/grub/zfs/zfs_znode.h: Likewise.
* include/grub/zfs/zil.h: Likewise.
* include/grub/zfs/zio.h: Likewise.
* include/grub/zfs/zio_checksum.h: Likewise.
* Makefile.util.def: Build ZFS into libgrubmods.
* grub-core/Makefile.core.def: Build zfs.mod.
2010-12-01 22:42:11 +01:00
Colin Watson
ea20f6e03a
merge some more commits from before Savannah compromise (mirrored by Launchpad)
2010-12-01 16:19:26 +00:00
Vladimir 'phcoder' Serbinenko
d980826df2
Remove \n from error message
2010-12-01 16:45:12 +01:00
Vladimir 'phcoder' Serbinenko
df80cd06fb
Check file type
2010-12-01 16:36:05 +01:00
Vladimir 'phcoder' Serbinenko
355b3eed0f
support trees
2010-12-01 16:22:51 +01:00
Vladimir 'phcoder' Serbinenko
b18610feb5
partial btrfs support. Now able to list and access files as long as all trees are flat
2010-12-01 01:23:47 +01:00
Vladimir 'phcoder' Serbinenko
3836e89df1
Add crc32c for btrfs
2010-12-01 01:22:55 +01:00
Szymon Janc
3f0f38317b
* grub-core/commands/regexp.c (grub_cmd_regexp): Remove unused
...
variable.
* grub-core/commands/wildcard.c (match_files): Likewise.
2010-11-30 21:35:59 +01:00
Robert Millan
3a4253b2c4
2010-11-30 Robert Millan <rmh@gnu.org>
...
* grub-core/loader/i386/bsd.c
(grub_cmd_freebsd_loadenv, grub_cmd_freebsd_module_elf): Check
whether kernel is loaded using grub_loader_is_loaded(), rather
than `kernel_type', which may still be `KERNEL_TYPE_NONE' under
certain error conditions.
2010-11-30 19:33:12 +01:00
Colin Watson
725d286634
merge commits from before Savannah compromise
2010-11-30 17:01:52 +00:00
Robert Millan
c5c9cd3e7d
Add missing include
2010-11-30 16:23:41 +01:00
Robert Millan
8c317b270f
2010-11-30 Robert Millan <rmh@gnu.org>
...
* grub-core/commands/echo.c (grub_cmd_echo): Call grub_refresh()
after printing a message.
2010-11-30 15:36:47 +01:00
Vladimir 'phcoder' Serbinenko
49d3ab4668
Avoid using tricks for initialising endian variables.
...
* grub-core/partmap/gpt.c (grub_gpt_partition_type_bios_boot):
Make const.
(GRUB_MOD_INIT): Don't byte-swap.
* include/grub/gpt_partition.h (GRUB_GPT_PARTITION_TYPE_BIOS_BOOT):
Use grub_cpu_to_le16_compile_time and grub_cpu_to_le32_compile_time.
* include/grub/types.h (grub_swap_bytes16_compile_time): New macro.
(grub_swap_bytes32_compile_time): Likewise.
(grub_cpu_to_le32_compile_time): Likewise.
(grub_cpu_to_le16_compile_time): Likewise.
2010-11-26 22:29:19 +01:00
Robert Millan
4e7db17be9
2010-11-26 Robert Millan <rmh@gnu.org>
...
* grub-core/term/i386/pc/vga_text.c (VGA_TEXT_SCREEN): Beautify.
Update all users.
2010-11-26 15:35:40 +01:00
BVK Chaitanya
2c7859b36f
merge with mainline
2010-11-25 19:54:50 +05:30
BVK Chaitanya
dfda224dd8
variable ordering
2010-11-25 19:07:02 +05:30
BVK Chaitanya
7955bea0d8
fix changelog and doc
2010-11-25 19:05:16 +05:30
BVK Chaitanya
5b08062083
replaced with grub_strchrsub function
2010-11-25 18:56:20 +05:30
Colin Watson
5a4072785b
* grub-core/Makefile.core.def (xz_decompress): Move -lgcc from
...
ldflags to ldadd, to fix link line ordering.
(none_decompress): Likewise.
2010-11-24 19:32:49 +00:00
Colin Watson
3030d8ec49
* grub-core/Makefile.core.def (kernel): Add kern/emu/cache.S for emu
...
platforms.
(grub-emu-lite): Remove kern/emu/cache.S.
2010-11-24 12:07:14 +00:00
Colin Watson
038b3ce8dc
* grub-core/Makefile.am (gentrigtables): Put -lm after $<; some
...
linkers are picky about this.
2010-11-23 13:00:05 +00:00
Colin Watson
bf16e98e3c
* grub-core/Makefile.am (command.lst): Adjust sed expression
...
ordering so that extended and priority commands aren't treated as
ordinary commands.
2010-11-23 12:52:40 +00:00
Colin Watson
7242bab6a4
* include/grub/gpt_partition.h (GRUB_GPT_PARTITION_TYPE_BIOS_BOOT):
...
Remove byte-swapping function calls, which are not valid in
structure initialisers.
* grub-core/partmap/gpt.c (grub_gpt_partition_type_bios_boot): Make
non-const.
(GRUB_MOD_INIT): Byte-swap data1, data2, and data3 fields of
grub_gpt_partition_type_bios_boot.
2010-11-23 10:48:46 +00:00
Vladimir 'phcoder' Serbinenko
7f8b0fd7f0
* grub-core/loader/i386/linux.c (grub_cmd_linux): Pass correctly the
...
bootloader version instead of 0.
2010-11-19 22:58:06 +01:00
Vladimir 'phcoder' Serbinenko
dfd240b122
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Fix spurious
...
warning.
2010-11-19 22:52:27 +01:00
Vladimir 'phcoder' Serbinenko
7b61e6096b
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Don't try to
...
retrieve the metadat sector if size isn't known.
* grub-core/disk/mdraid_linux.c (grub_mdraid_detect): Likewise.
2010-11-19 22:48:26 +01:00
BVK Chaitanya
f866fe808b
reuse code from legacy parser
2010-11-19 19:08:44 +05:30
BVK Chaitanya
9acdcbf325
use single quotes in menuentry setparams command
2010-11-19 10:15:25 +05:30
Robert Millan
9dfe92d07a
2010-11-18 Robert Millan <rmh@gnu.org>
...
* grub-core/fs/btrfs.c (grub_btrfs_mount): Replace grub_strncmp()
with grub_memcmp().
2010-11-18 16:52:27 +01:00
Vladimir 'phcoder' Serbinenko
41cc919ef7
* grub-core/normal/menu_entry.c (print_up): Fix displacement of up
...
arrow.
Reported by: Jordan Uggla.
2010-11-18 02:08:01 +01:00
Vladimir 'phcoder' Serbinenko
1afcc914c5
Make better UTF compliant.
...
* grub-core/normal/charset.c (grub_utf8_to_utf16): Handle 6- and 7-byte
sequences as incorrect.
(grub_is_valid_utf8): Likewise.
(grub_utf8_to_ucs4): Likewise.
(grub_ucs4_to_utf8): Handle codepoints outside of BMP.
(grub_ucs4_to_utf8_alloc): Likewise.
* include/grub/charset.h (grub_utf16_to_utf8): Likewise.
2010-11-17 16:13:16 +01:00
Vladimir 'phcoder' Serbinenko
f18088844f
Make legacy_source behave like source.
...
* grub-core/commands/legacycfg.c (legacy_file): Don't call
grub_show_menu.
(grub_cmd_legacy_source): Call grub_show_menu if needed.
2010-11-17 08:41:18 +01:00
Vladimir 'phcoder' Serbinenko
e98937aaf0
* grub-core/term/at_keyboard.c (grub_keyboard_controller_read)
...
[GRUB_MACHINE_MIPS_YEELOONG || GRUB_MACHINE_QEMU]: ifdef-ed out
(now unused).
(grub_keyboard_controller_init)
[GRUB_MACHINE_MIPS_YEELOONG || GRUB_MACHINE_QEMU]: Don't attempt to
read the initial state since controller isn't inited yet.
2010-11-15 10:01:11 +01:00
Vladimir 'phcoder' Serbinenko
f6bbabc373
* grub-core/lib/relocator.c (malloc_in_range): Take into account that
...
allocate_regbeg may need to create new chunk header.
2010-11-15 09:50:58 +01:00
Vladimir 'phcoder' Serbinenko
22e7dbb2bb
Fix quoting in legacy parser.
...
* grub-core/lib/legacy_parse.c (grub_legacy_escape): Correctly handle
single quotes.
(grub_legacy_parse): Likewise.
Reported by: Jordan Uggla.
Tested by: Jordan Uggla.
2010-11-15 00:33:28 +01:00
Vladimir 'phcoder' Serbinenko
03f80960cf
Don't add -lgcc on i386 and x86_64.
...
* configure.ac (LIBS): Don't add -lgcc on i386 and x86_64.
* conf/Makefile.common (LDADD_KERNEL): Likewise.
* grub-core/Makefile.core.def (kernel): Use LDADD_KERNEL.
2010-11-14 23:36:20 +01:00
Modestas Vainius
d20a3b371c
* grub-core/kern/emu/getroot.c (grub_util_is_dmraid): Recognise ddf1_
...
fakeraid.
2010-11-14 17:09:13 +01:00
Giuseppe Caizzone
69c4feebb1
Add generic logical block size support for UDF.
...
* grub-core/fs/udf.c (GRUB_UDF_LOG2_BLKSIZE): Removed.
(GRUB_UDF_BLKSZ): Removed.
(struct grub_udf_data): New field "lbshift" to hold the logical block
size of the file system in log2 format. All users updated.
(sblocklist): Change type to unsigned.
(grub_udf_mount): Change type of "sblklist" to unsigned.
Move AVDP search before VRS recognition, because the latter requires
knowledge of the logical block size, which is detected during the
former.
Detect and validate logical block size during AVDP search, adding
support for block sizes 512, 1024 and 4096.
Make VRS recognition independent of block size.
2010-11-14 17:03:49 +01:00
Giuseppe Caizzone
e53609331b
Add generic logical block size support for UDF.
...
* grub-core/fs/udf.c (GRUB_UDF_LOG2_BLKSIZE): Removed.
(GRUB_UDF_BLKSZ): Removed.
(struct grub_udf_data): New field "lbshift" to hold the logical block
size of the file system in log2 format. All users updated.
(sblocklist): Change type to unsigned.
(grub_udf_mount): Change type of "sblklist" to unsigned.
Move AVDP search before VRS recognition, because the latter requires
knowledge of the logical block size, which is detected during the
former.
Detect and validate logical block size during AVDP search, adding
support for block sizes 512, 1024 and 4096.
Make VRS recognition independent of block size.
2010-11-14 16:58:50 +01:00
Giuseppe Caizzone
cb0229c587
Properly handle deleted files on UDF.
...
* grub-core/fs/udf.c (grub_udf_iterate_dir): Skip directory entries
whose "characteristics" field has the bit GRUB_UDF_FID_CHAR_DELETED
set.
2010-11-14 16:51:45 +01:00
Giuseppe Caizzone
406858a8a9
Support reading files larger than 2 GiB.
...
* grub-core/fs/udf.c (grub_udf_iterate_dir): Change type of variable
"offset" to grub_off_t.
(grub_udf_read_file): Likewise for parameter "pos".
2010-11-14 16:48:17 +01:00
Vladimir 'phcoder' Serbinenko
1fd08bf111
* grub-core/disk/lvm.c (GRUB_MOD_FINI): Reset the vg_list. Fixes
...
LVM on RAID support.
2010-11-14 14:13:11 +01:00
Vladimir 'phcoder' Serbinenko
de1a024fff
Properly define WORDS_BIGENDIAN in wrapped environments.
...
* grub-core/lib/libgcrypt_wrap/cipher_wrap.h (WORDS_BIGENDIAN): New
definition.
* grub-core/lib/posix_wrap/sys/types.h (WORDS_BIGENDIAN): Likewise.
Reported by: Manoel Rebelo Abranches.
Tested by: Manoel Rebelo Abranches.
2010-11-14 13:37:59 +01:00
Vladimir 'phcoder' Serbinenko
a06eb03ad0
Support long command lines as per 2.06 Linux boot protocol
2010-11-13 21:27:08 +01:00
Vladimir 'phcoder' Serbinenko
58c184be7b
Support big ext2 files.
...
* grub-core/fs/ext2.c (grub_ext2_inode): Rename dir_acl to size_high.
(grub_ext2_read_block): Support triple indirect blocks.
(grub_ext2_read_file): Use 64-bit types and read size_high.
(grub_ext2_open): Read size_high.
Reported by: Ximin Luo.
Tested by: Manoel Rebelo Abranches.
2010-11-13 16:11:24 +01:00
Vladimir 'phcoder' Serbinenko
10001ac54b
* grub-core/kern/i386/pc/startup.S (multiboot_trampoline): Add missing
...
jump.
2010-11-12 08:45:16 +01:00
Vladimir 'phcoder' Serbinenko
c0e103e4da
Support for partitioned loop devices. Improved devmapper support
2010-11-08 16:51:50 +01:00
Manoel Rebelo Abranches
9c4cf53bfe
2010-11-08 Manoel Rebelo Abranches <mrabran@br.ibm.com>
...
* include/grub/elfload.h (grub_elf32_size): New parameter. All users updated.
Return maximum segments alignment.
(grub_elf64_size): Likewise.
* kern/elf.c (grub_elf32_size): New parameter. All users updated.
Return maximum segments alignment.
(grub_elf64_size): Likewise.
* grub-core/loader/powerpc/ieee1275/linux.c:
(grub_linux_claimmap_iterate): New function. Uses the "available"property
in the "memory" node for memory allocation for kernel in the PowerPC loader.
(grub_linux_load32): Correctly find linux entry point offset.
(grub_linux_load64): Likewise.
2010-11-08 11:14:54 -02:00
BVK Chaitanya
87220a6881
merge with mainline
2010-11-07 18:31:41 +05:30
BVK Chaitanya
a8152fedab
suppress shell expansion inside quoted strings
2010-11-07 16:13:14 +05:30
Vladimir 'phcoder' Serbinenko
80c6d25eef
* grub-core/kern/emu/hostdisk.c
...
(convert_system_partition_to_system_disk): Handle devices like "sdaa1".
2010-11-07 00:10:49 +01:00
Vladimir 'phcoder' Serbinenko
34706ddc06
* grub-core/fs/ntfs.c (grub_ntfs_uuid): Make uppercase.
2010-11-06 21:54:24 +01:00
Vladimir 'phcoder' Serbinenko
9c693bd66a
Properly register serial terminfo.
...
Reported by: Jordan Uggla
* grub-core/term/serial.c (grub_serial_terminfo_input_template): New
const.
(grub_serial_terminfo_output_template): Likewise.
(grub_cmd_serial): Register "serial" with terminfo.
(GRUB_MOD_INIT(serial)): Fill grub_serial_terminfo_input and
grub_serial_terminfo_output.
2010-11-06 20:40:08 +01:00
Robert Millan
b9b3839f6d
2010-11-05 Robert Millan <rmh@gnu.org>
...
On Yeeloong, pass machine type information to Linux.
* grub-core/loader/mips/linux.c [GRUB_MACHINE_MIPS_YEELOONG]
(LOONGSON_MACHTYPE): New macro, set to
"machtype=lemote-yeeloong-2f-8.9inches".
[LOONGSON_MACHTYPE] (grub_cmd_linux): Pass LOONGSON_MACHTYPE as
additional argument to Linux.
2010-11-05 19:48:55 +01:00
Grégoire Sutre
33b4b0c61a
Fix an integer overflow.
2010-11-01 23:42:53 +01:00
Vladimir 'phcoder' Serbinenko
2b36fbf493
* grub-core/loader/i386/linux.c (grub_cmd_linux): Autoload vbe.mod if
...
vga= option is supplied.
2010-11-01 13:10:51 +01:00
Vladimir 'phcoder' Serbinenko
6428dec358
* grub-core/lib/arg.c (grub_arg_parse): Avoid interpreting direct
...
argument as an argument to no-argument option.
2010-11-01 12:45:51 +01:00
Vladimir 'phcoder' Serbinenko
3a1197cdb0
* grub-core/disk/mdraid1x_linux.c (grub_mdraid_detect): Do not put
...
elements with invlid index.
* grub-core/disk/mdraid_linux.c (grub_mdraid_detect): Likewise.
* grub-core/disk/raid.c (insert_array): Automatically reallocate
members.
* include/grub/raid.h (grub_raid_member): New struct.
(grub_raid_array): Transform devices and start_sector into usage of
grub_raid_member. All users updated
(allocated_devs): New member.
2010-11-01 10:20:58 +01:00
Vladimir 'phcoder' Serbinenko
dc5aeea5b9
merge mainline into net
2010-10-25 13:19:10 +02:00
Vladimir 'phcoder' Serbinenko
4f6a2e2175
* grub-core/kern/emu/misc.c
...
(grub_make_system_path_relative_to_its_root)
[HAVE_LIBZFS && HAVE_LIBNVPAIR]: Fix mountpoint return on ZFS.
2010-10-23 20:39:08 +02:00
Vladimir 'phcoder' Serbinenko
5c81f8b349
* grub-core/kern/emu/misc.c
...
(grub_make_system_path_relative_to_its_root): Revert r2882.
2010-10-23 20:34:50 +02:00
Vladimir 'phcoder' Serbinenko
e138c45836
* grub-core/lib/relocator.c (grub_relocator_subchunk): Remove now
...
useless field head. All users updated.
(free_subchunk): Correct handling of IN_REGION subchunk.
2010-10-22 22:49:36 +02:00
Grégoire Sutre
b65ea15514
Make mktemp invocations portable.
2010-10-18 22:50:01 +02:00
Szymon Janc
800e6a9be5
* grub-core/normal/auth.c (grub_auth_check_authentication):
...
Set-but-not-used variable removed.
2010-10-17 15:41:54 +02:00
Vladimir 'phcoder' Serbinenko
7bced4583e
* grub-core/kern/i386/pc/startup.S (grub_console_setcursor): Check
...
cursor shape for sanity.
2010-10-17 01:49:06 +02:00
Szymon Janc
6bdda8f877
* grub-core/commands/legacycfg.c (grub_cmd_legacy_kernel):
...
Set-but-not-used variable ifdef'ed.
* grub-core/lib/legacy_parse.c (grub_legacy_parse): Likewise.
* grub-core/bus/usb/ohci.c (grub_ohci_pci_iter): Set-but-not-used
variable removed.
* grub-core/disk/lvm.c (grub_lvm_scan_device): Likewise.
* grub-core/fs/jfs.c (grub_jfs_find_file): Likewise.
* grub-core/fs/minix.c (grub_minix_dir): Likewise.
* grub-core/fs/sfs.c (grub_sfs_read_extent): Likewise.
* grub-core/fs/ufs.c (grub_ufs_dir): Likewise.
* grub-core/gfxmenu/gui_list.c (grub_gui_list_new): Likewise.
* grub-core/gfxmenu/view.c (redraw_menu_visit): Likewise.
* grub-core/gfxmenu/widget-box.c (draw): Likewise.
* grub-core/lib/relocator.c (malloc_in_range): Likewise.
* grub-core/loader/i386/bsdXX.c (grub_netbsd_load_elf_meta): Likewise.
* grub-core/loader/i386/bsd_pagetable.c (fill_bsd64_pagetable):
Likewise.
2010-10-16 22:16:52 +02:00
Vladimir 'phcoder' Serbinenko
e19b016b30
* grub-core/commands/acpihalt.c (skip_ext_op): Skip index field op.
...
* include/grub/acpi.h (GRUB_ACPI_EXTOPCODE_INDEX_FIELD_OP): New
enum value.
2010-10-16 20:01:30 +02:00
Vladimir 'phcoder' Serbinenko
6c8d300275
* grub-core/commands/acpihalt.c (get_sleep_type): Accept \_S5_ as
...
synonym to _S5_. Needed for some DSDTs.
2010-10-16 19:12:18 +02:00
Vladimir 'phcoder' Serbinenko
c32b51c9f9
Userspace ACPI parser debugging.
...
* grub-core/commands/acpihalt.c [GRUB_DSDT_TEST]: Include userspace
headers and add relevant defines. Don't include standard headers.
(main) [GRUB_DSDT_TEST]: New function.
* include/grub/acpi.h [GRUB_DSDT_TEST]: Don't include standard headers.
Don't declare functions.
2010-10-16 19:06:55 +02:00
Vladimir 'phcoder' Serbinenko
fbfbeb394f
Remove dead grub_efi_mm_fini.
...
* grub-core/kern/efi/mm.c (allocated_page): Removed.
(ALLOCATED_PAGES_SIZE): Likewise.
(MAX_ALLOCATED_PAGES): Likewise.
(allocated_pages): Likewise.
(grub_efi_allocate_pages): Don't record allocated pages.
(grub_efi_free_pages): Likewise.
(grub_efi_mm_init): Likewise.
(grub_efi_mm_fini): Removed.
2010-10-16 17:50:48 +02:00
Vladimir 'phcoder' Serbinenko
65f7ed7c9a
* grub-core/kern/efi/mm.c (BYTES_TO_PAGES): Round up instead of down.
...
(grub_efi_mm_init): Take into account the memory map size increase.
2010-10-16 17:44:35 +02:00
Vladimir 'phcoder' Serbinenko
24977b4451
* grub-core/term/ns8250.c (do_real_config): Set port->broken to 0.
...
(serial_hw_put): Wait based on real time rather than port reads. Don't
roken ports.
* include/grub/serial.h (grub_serial_port): New field broken.
2010-10-16 17:29:12 +02:00
Robert Millan
1eb01cd276
2010-10-16 Robert Millan <rmh@gnu.org>
...
* grub-core/kern/emu/misc.c
(grub_make_system_path_relative_to_its_root): Fix premature return
when processing non-root ZFS filesystems.
2010-10-16 02:30:14 +02:00
Vladimir 'phcoder' Serbinenko
d0f4c1ea0f
* grub-core/efiemu/main.c (grub_efiemu_prepare): Handle errors from
...
grub_efiemu_autocore.
2010-10-14 15:44:04 +02:00
Vladimir 'phcoder' Serbinenko
d87c681fd4
* grub-core/kern/i386/pc/startup.S (bypass_table): Use 0x1b explicitly
...
rather than 0x1b.
(grub_console_getkey): Use correct jae opcode rather than ja.
2010-10-14 15:35:55 +02:00
Vladimir 'phcoder' Serbinenko
20c6bb7e9e
Correctly distinguish mdraid flavours.
...
* grub-core/disk/raid.c (grub_raid_getname) [GRUB_UTIL]: New function.
(insert_array): New argument raid.
* include/grub/disk.h (grub_disk_dev) [GRUB_UTIL]: New member raidname.
* include/grub/raid.h (grub_raid_array) [GRUB_UTIL]: New member driver.
* util/grub-probe.c (probe): PRint raidname instead of plainly "mdraid".
2010-10-08 23:27:27 +02:00
Vladimir 'phcoder' Serbinenko
74baff844e
* grub-core/kern/i386/pc/startup.S (grub_console_getkey): Fix incorrect
...
handling of special keys.
2010-10-06 19:46:20 +02:00
starous
a94551944e
usbtrans.c - wrong max packet size for bulk transfer
2010-10-02 20:49:05 +02:00
Vladimir 'phcoder' Serbinenko
441cfe65c0
Clear out 0x80 color bit on EFI.
...
Tested by: decoder
Reported by: decoder and meta tech.
* grub-core/term/efi/console.c (grub_console_standard_color): Removed.
(grub_console_setcolorstate): Clear out 0x80 bit.
Use GRUB_TERM_DEFAULT_STANDARD_COLOR.
(grub_console_output): Use GRUB_TERM_DEFAULT_NORMAL_COLOR.
Use GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR.
2010-10-01 16:54:38 +02:00
Vladimir 'phcoder' Serbinenko
bf26bcc435
* grub-core/loader/i386/linux.c (DEFAULT_VIDEO_MODE) [GRUB_MACHINE_EFI]:
...
Set to "auto".
2010-10-01 16:24:43 +02:00
Vladimir 'phcoder' Serbinenko
6e3c515d5b
* grub-core/gettext/gettext.c (grub_gettext_init_ext): Avoid using
...
mo_file after freeing.
2010-09-30 21:07:51 +02:00
Vladimir 'phcoder' Serbinenko
e6d983ba6d
* grub-core/normal/term.c (read_terminal_list): Free in a right order.
2010-09-30 21:04:09 +02:00
Vladimir 'phcoder' Serbinenko
74ccb5b5e2
* grub-core/script/execute.c (grub_script_execute_sourcecode): Set
...
flags.
2010-09-30 20:59:20 +02:00
Vladimir 'phcoder' Serbinenko
ee74fa4822
Put terminfo into core on ieee1275 and yeeloong (needed for console).
...
* gentpl.py: New groups terminfoinkernel and terminfomodule.
* grub-core/Makefile.am (KERNEL_HEADER_FILES): Include extcmd.h, arg.h
and terminfo.h when needed.
* grub-core/Makefile.core.def (kernel): Include term/terminfo.c,
term/tparm.c, commands/extcmd.c, lib/arg.c on terminfokernel.
(terminfo): Enable only on terminfokernel.
(extcmd): Likewise.
* include/grub/extcmd.h: Add missing EXPORT_FUNC.
* include/grub/lib/arg.h: Likewise.
* grub-core/term/ieee1275/ofconsole.c (grub_ofconsole_dimensions): Fix
incorrect usage of ->.
2010-09-30 17:50:01 +02:00
Vladimir 'phcoder' Serbinenko
aa438e6818
* grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi]
...
[GRUB_MACHINE_EFI && __i386__]: Fix typo.
2010-09-29 23:58:43 +02:00
Vladimir 'phcoder' Serbinenko
579940128b
Fix coreboot compilation.
...
* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_get_mbi_size):
Take VBE info into account even if only text is supported.
(fill_vbe_info): Take into account the case when only VGA text
is supported.
* include/grub/multiboot.h (GRUB_MACHINE_HAS_VBE): Set to zero
on coreboot, multiboot and qemu.
2010-09-29 23:51:12 +02:00
Vladimir 'phcoder' Serbinenko
2a4066114d
* grub-core/lib/relocator.c (malloc_in_range): Trim too verbose
...
debug messages.
(grub_relocator_prepare_relocs): Set movers_chunk.srcv.
2010-09-29 23:19:21 +02:00
Vladimir 'phcoder' Serbinenko
d33613fcf3
* grub-core/loader/i386/bsd.c (grub_cmd_netbsd): Provide default serial
...
parameters.
2010-09-29 22:51:12 +02:00
Vladimir 'phcoder' Serbinenko
44a1b4327a
* grub-core/lib/arg.c (grub_arg_parse): Fix treating of all commands as
...
if they were BSD-style.
2010-09-29 22:48:38 +02:00
Vladimir 'phcoder' Serbinenko
edde54e656
* grub-core/boot/i386/pc/lnxboot.S: Replace
...
GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE with
GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART.
2010-09-29 22:45:57 +02:00
Vladimir 'phcoder' Serbinenko
b65830fae1
Write embedding zone using Reed-Solomon.
...
* Makefile.util.def (grub-setup): Add grub-core/lib/reed_solomon.c.
* grub-core/Makefile.am (rs_decoder.S): New target.
(kern/i386/pc/startup.S): Depend on rs_decoder.S.
* grub-core/kern/i386/pc/startup.S (reed_solomon_redundancy): New field.
(multiboot): Move to RS part.
(post_reed_solomon): New label.
(grub_boot_drive): Move to non-RS part since it's modified in memory
on boot.
Include rs_decoder.S.
* grub-core/lib/reed_solomon.c: New file.
* include/grub/offsets.h (GRUB_KERNEL_I386_PC_REED_SOLOMON_REDUNDANCY):
New definition.
(GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE): Removed.
(GRUB_KERNEL_I386_PC_RAW_SIZE): Updated.
(GRUB_KERNEL_I386_PC_NO_REED_SOLOMON_PART): New definition.
* include/grub/partition.h (grub_partition_map): Change prototype of
embed to allow returning additional sectors.
* include/grub/reed_solomon.h: New file.
* util/grub-setup.c (setup): Handle Reed-Solomon.
2010-09-29 21:33:38 +02:00
Colin Watson
0b4b227fae
* grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix
...
i386 and x86-64 definedness tests.
2010-09-28 17:38:34 +01:00
Yves Blusseau
f772623bc0
Fix generation of kernel_syms.lst
...
* grub-core/Makefile.am (kernel_syms.lst): Fix value and position of
ASM_PREFIX
2010-09-27 11:11:38 +02:00
Robert Millan
8e57a6ca44
2010-09-26 Robert Millan <rmh@gnu.org>
...
Support degraded ZFS arrays in "grub-probe -t device" resolution.
* grub-core/kern/emu/getroot.c (find_root_device_from_libzfs): When
the pool is an array of devices, iterate through it and return the
first device that passes a stat() test (instead of blindly returning
the first one).
2010-09-26 16:11:33 +02:00
Robert Millan
f913083640
2010-09-26 Robert Millan <rmh@gnu.org>
...
Build fixes for GNU/kFreeBSD.
* Makefile.util.def: Add `$(LIBZFS) $(LIBNVPAIR)' library dependencies
to programs that require ZFS conversion.
* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_floppy): Support
kernels that don't have FLOPPY_MAJOR.
2010-09-26 15:53:05 +02:00
Vladimir 'phcoder' Serbinenko
4e2b20a79a
Add missing dependency on rs_Decoder.S
2010-09-26 13:37:08 +02:00
Vladimir 'phcoder' Serbinenko
40ca6b29fd
Fix missing mreparm=3
2010-09-25 21:43:04 +02:00
Vladimir 'phcoder' Serbinenko
53c9e7798c
Remove debug printf
2010-09-25 21:42:36 +02:00
Vladimir 'phcoder' Serbinenko
25e09515ad
Make mb header to protected part
2010-09-25 21:42:13 +02:00
Vladimir 'phcoder' Serbinenko
3ac9e79207
Multiple bugs correction for Reed-Solomon
2010-09-25 20:40:26 +02:00
Vladimir 'phcoder' Serbinenko
419cbeb06d
hook Reed-Solomon into startup.S
2010-09-25 19:33:05 +02:00
BVK Chaitanya
96510fafd2
fix typo
2010-09-25 10:48:48 +05:30
BVK Chaitanya
449333eb7d
Fix grub-emu build.
...
* grub-core/kern/emu/main.c: Remove #include <getopt.h>.
* grub-core/kern/emu/full.c: Split grub_mdraid_{init,fini} into
mdraid09 and mdraid1x.
2010-09-25 10:43:09 +05:30
Vladimir 'phcoder' Serbinenko
4f0de6881c
C part of Reed-Solomon
2010-09-24 14:05:47 +02:00
Colin Watson
e1fd193905
Re-enable grub-extras.
...
* autogen.sh: Create symlinks to ${GRUB_CONTRIB} if necessary to
avoid confusing Automake. Run autogen only twice, once for the top
level and once for grub-core. Add Makefile.util.def and
Makefile.core.def from extra modules to the appropriate autogen
invocations. If Makefile.common exists in an extra module, include
it in both Makefile.util.am and grub-core/Makefile.core.am;
similarly, include any Makefile.util.common file in Makefile.util.am
and any Makefile.core.common file in grub-core/Makefile.core.am.
* conf/Makefile.common ($(top_srcdir)/grub-core/Makefile.core.am):
Depend on $(top_srcdir)/grub-core/Makefile.gcry.def.
($(top_srcdir)/grub-core/Makefile.gcry.def): Remove.
* grub-core/Makefile.am: Remove inclusion of Makefile.gcry.am.
* gentpl.py (gvar_add): Turn GVARS into a set.
(global_variable_initializers): Sort global variables on output.
(vars_init): New function.
(first_time): Likewise.
(library): Ensure that non-global variable initialisations are
emitted before the first time we emit code for a library block.
Append to variables rather than setting them. Only emit
noinst_LIBRARIES, BUILT_SOURCES, and CLEANFILES the first time for
each conditional path.
(program): installdir() emits an Autogen macro, so must be passed to
var_add rather than gvar_add.
(data): Likewise.
(script): Likewise.
(rules): New function, centralising handling for different target
types. Set up Guile association lists for first_time and vars_init,
and send most output to a diversion so that variable initialisations
can be emitted first.
(module_rules): Use new rules function.
(kernel_rules): Likewise.
(image_rules): Likewise.
(library_rules): Likewise.
(program_rules): Likewise.
(script_rules): Likewise.
(data_rules): Likewise.
* configure.ac: Add AC_PROG_LN_S, for the benefit of ntldr-img.
* .bzrignore: Add contrib and grub-core/contrib. Remove
grub-core/Makefile.gcry.am.
2010-09-24 09:48:27 +01:00
Yves Blusseau
1d12cf2947
* grub-core/lib/LzFind.c: Add missing include.
...
* grub-core/lib/LzmaEnc.c: Likewise.
* grub-core/script/lexer.c: Likewise.
* grub-core/script/yylex.l: Likewise.
* util/grub-macho2img.c: Likewise.
* util/grub-menulst2cfg.c: Likewise.
* util/grub-mklayout.c: Likewise.
* util/grub-mkpasswd-pbkdf2.c
* util/grub-mkrelpath.c: Likewise.
* util/resolve.c: Likewise.
2010-09-24 09:19:57 +02:00
Grégoire Sutre
f5a109e277
Variable initialization.
2010-09-24 01:13:50 +02:00
Vladimir 'phcoder' Serbinenko
6d0fa83c79
Support xz compression on yeeloong.
...
* Makefile.util.def (grub-mkimage): Add $(LIBLZMA).
* configure.ac: Check for LZMA.
* grub-core/Makefile.core.def (xz_decompress): New target.
(none_decompress): Likewise.
* grub-core/boot/decompressor/minilib.c: New file.
* grub-core/boot/decompressor/none.c: Likewise.
* grub-core/boot/decompressor/xz.c: Likewise.
* grub-core/kern/mips/cache.S: Change to noreorder nomacro.
* grub-core/kern/mips/cache_flush.S: Likewise.
* grub-core/kern/i386/pc/lzma_decode.S: Remove dead code.
* grub-core/kern/mips/startup.S: Move first stage to ...
* grub-core/boot/mips/startup_raw.S: ...here. Change to noreorder
nomacro.
* grub-core/kern/mips/startup.S: Change to noreorder nomacro.
* grub-core/lib/mips/relocator_asm.S: Change to noreorder nomacro.
* grub-core/lib/xzembed/xz_dec_bcj.c [GRUB_EMBED_DECOMPRESSOR]:
Allocate statically.
* grub-core/lib/xzembed/xz_dec_lzma2.c [GRUB_EMBED_DECOMPRESSOR]:
Allocate statically or use scratch. Don't check CRC32.
* grub-core/lib/xzembed/xz_dec_stream.c [GRUB_EMBED_DECOMPRESSOR]:
Allocate statically. Don't check CRC32.
* include/grub/decompressor.h: New file.
* include/grub/offsets.h (GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE):
Removed.
(GRUB_KERNEL_MIPS_YEELOONG_UNCOMPRESSED_SIZE): New field.
(GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE): Adjusted.
(GRUB_KERNEL_MIPS_YEELOONG_PREFIX): Likewise.
(GRUB_KERNEL_MIPS_YEELOONG_PREFIX_END): Likewise.
(GRUB_KERNEL_MACHINE_UNCOMPRESSED_SIZE): New define.
* util/grub-mkimage.c (grub_compression_t): New type.
(PLATFORM_FLAGS_DECOMPRESSORS): New flag.
(image_target_desc): New field default_compression.
(image_targets): Adjust yeeloong targets.
(compress_kernel_xz) [HAVE_LIBLZMA]: New function.
(compress_kernel): New parameter comp.
(generate_image): Likewise. Handle new compression case.
(options): New option --compression
(help): Likewise.
(main): Handle new option.
2010-09-23 02:10:44 +02:00
Vladimir 'phcoder' Serbinenko
04d22dddd9
Fix a bunch of net issues
2010-09-23 00:45:39 +02:00
Grégoire Sutre
1b655af685
Define FLOPPY_MAJOR on NetBSD.
2010-09-22 23:32:58 +02:00
Vladimir 'phcoder' Serbinenko
ce3a2ec025
Remove some dead code
2010-09-22 20:34:20 +02:00
Vladimir 'phcoder' Serbinenko
760a7e5aed
Merge mainline into net
2010-09-22 20:13:00 +02:00
Colin Watson
8f03f0b580
* grub-core/loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix
...
typo in __i386__ conditional.
2010-09-22 16:57:49 +01:00
Vladimir 'phcoder' Serbinenko
90451bb1c9
networking in grub-emu
2010-09-22 17:14:43 +02:00
Vladimir 'phcoder' Serbinenko
6b1b3423dd
Fix error handling in ofnet
2010-09-22 17:14:14 +02:00
Vladimir 'phcoder' Serbinenko
7835dfd3e8
* grub-core/loader/multiboot_mbi2.c (GRUB_MACHINE_EFI): Add missing
...
include.
2010-09-22 17:13:21 +02:00
Vladimir 'phcoder' Serbinenko
e255597e51
Implement EFI and ACPI multiboot2 extensions.
...
* grub-core/loader/multiboot_mbi2.c (grub_multiboot_load): Declare
new tags as supported.
(acpiv2_size): New function.
(grub_multiboot_get_mbi_size): Take new tags into account.
(grub_multiboot_make_mbi): Add new tags.
* include/grub/multiboot.h (GRUB_MACHINE_HAS_ACPI): New definition.
2010-09-22 14:51:49 +02:00
Vladimir 'phcoder' Serbinenko
9a0e5c815e
Fix bugs in asm code
2010-09-22 00:53:34 +02:00
Vladimir 'phcoder' Serbinenko
67c4bb722d
Align scratch
2010-09-22 00:52:33 +02:00
starous
6cc1405144
.../serial/common.c - added missing configuration
2010-09-21 21:57:57 +02:00
Vladimir 'phcoder' Serbinenko
758194b076
Allow compression algorithm specification
2010-09-21 20:30:28 +02:00
Colin Watson
df7769d8dc
* grub-core/normal/menu_entry.c (run): Make sure we always return
...
a value.
2010-09-21 19:03:11 +01:00
Vladimir 'phcoder' Serbinenko
e0a8ef26e4
MAke a separate scratch for decompressor
2010-09-21 19:39:51 +02:00
Colin Watson
b031012d70
* grub-core/commands/efi/lsefimmap.c (grub_cmd_lsefimmap):
...
NumberOfPages is UINT64 according to the UEFI specification, not
UINTN. Fix printf format.
2010-09-21 16:58:08 +01:00
Colin Watson
174de8f340
* grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Change type of
...
`err' to grub_usb_err_t.
Reported and tested by: KESHAV P.R.
2010-09-21 16:13:04 +01:00