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
9b710a888e
* configure.ac: Bump version to 1.99~rc2.
2011-04-20 09:23:55 +02: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
a5102d9433
* util/grub-mkimage.c (generate_image): Add forgotten comma.
2011-04-18 17:47:21 +02:00
Vladimir 'phcoder' Serbinenko
f3fb7b36df
* util/grub-mkimage.c (generate_image): Update fwstart.img hash after
...
performing the necessary test.
2011-04-18 09:31:13 +02:00
Vladimir 'phcoder' Serbinenko
9ac718b061
* Makefile.am (multiboot.elf): Add -Wl,--build-id=none.
...
(kfreebsd.elf): Likewise.
(pc-chainloader.elf): Likewise.
(ntldr.elf): Likewise.
2011-04-16 17:24:47 +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
e74c31125d
* util/grub.d/10_linux.in: Add rootflags=subvol=<name> if / is on a
...
btrfs subvolume.
* util/grub.d/20_linux_xen.in: Likewise.
2011-04-13 12:57:26 +01: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
Colin Watson
9d5f81622c
* docs/grub.texi (normal): New section.
...
(normal_exit): New section.
(Embedded configuration): Add reference to normal.
(GRUB only offers a rescue shell): Likewise.
* docs/grub-dev.texi (Error Handling): Fix typo.
2011-04-12 13:23:19 +01:00
Colin Watson
09a9d66f1d
* NEWS: Drop obsolete entry about probe-only btrfs support.
2011-04-12 11:44:35 +01:00
Colin Watson
0c67693394
* util/import_gcry.py: Fix typo.
2011-04-12 11:39:17 +01:00
Vladimir 'phcoder' Serbinenko
ec9f5e0d73
* NEWS: Add btrfs support.
2011-04-11 23:30:15 +02: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
8a3bc88ea7
* util/grub-fstest.c (cmd_cmp): Check that sizes match.
2011-04-11 07:41:59 +02:00
Vladimir 'phcoder' Serbinenko
af869a4ab9
* util/grub-fstest.c (read_file): Report GRUB error if file opening
...
failed.
2011-04-11 07:40:53 +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
Alexander Kurtz
cbac5b1ece
* util/grub-mkconfig_lib.in: Add missing quotes.
2011-04-10 15:30:45 +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