Robert Millan [Sat, 13 Nov 2010 18:09:54 +0000 (19:09 +0100)]
* Import from upstream:
- refuse_embedingless_cross_disk.patch: Refuse to do a cross-disk
embeddingless install rather than creating a broken install.
- fix_grub_install_error_msg.patch: Replace useless recomendation to
pass --modules with a recomendation to report a bug.
Colin Watson [Mon, 23 Aug 2010 08:55:01 +0000 (09:55 +0100)]
Run update-grub from kernel hooks if DEB_MAINT_PARAMS is unset, for
compatibility with old kernel packages. This may produce duplicate runs
of update-grub, but that's better than not running it at all (closes:
#594037).
Colin Watson [Wed, 4 Aug 2010 03:30:51 +0000 (04:30 +0100)]
Extend the existing GRUB_LEGACY_0_BASED_PARTITIONS handling to avoid
new-style partition naming when generating output for GRUB Legacy
(closes: #590554).
Colin Watson [Wed, 4 Aug 2010 02:45:47 +0000 (03:45 +0100)]
Add kernel hook scripts and remove any uses of update-grub as a
postinst_hook or postrm_hook in /etc/kernel-img.conf (closes: #554175).
Thanks to Ben Hutchings for advice and to Harald Braumann for an early
implementation.
Colin Watson [Mon, 2 Aug 2010 19:54:38 +0000 (20:54 +0100)]
* New Bazaar snapshot.
- Remove compatibility with terminal.mod prior to
terminal_input/terminal_output separation (LP: #519358).
- Enable `grub-probe -t device' resolution on ZFS.
- Don't use UUID for LVM root when generating Xen entries (closes:
#591093).
- Restore missing whitespace to commands' --help output (closes:
#590874).
- Select unique numbers for named RAID arrays, for use as keys in the
disk cache.
Robert Millan [Sun, 1 Aug 2010 21:21:09 +0000 (23:21 +0200)]
2010-08-01 Robert Millan <rmh@gnu.org>
* util/grub.d/10_kfreebsd.in: Initialize ${kfreebsd_device} as the
kFreeBSD device name, except on ZFS where the filesystem label is
used.
(kfreebsd_entry): On ZFS root, load `opensolaris.ko', `zfs.ko' and
`/boot/zfs/zpool.cache'.
Set mountfrom kernel variable using ${kfreebsd_device}.
* kern/emu/getroot.c (find_root_device_from_libzfs): Use
grub_get_libzfs_handle() to obtain a libzfs handle instead of
accessing `libzfs_handle' directly.
* kern/emu/getroot.c (find_root_device_from_libzfs): Split code for
finding zpool from mount point into ...
* kern/emu/misc.c (grub_find_zpool_from_mount_point): ... this.
* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): When
requested path is part of a ZFS pool, use
grub_find_zpool_from_mount_point() to detect its filesystem name,
and generate a path with `/fsname@path' syntax.
Colin Watson [Sun, 1 Aug 2010 16:25:09 +0000 (11:25 -0500)]
* docs/grub.texi (Simple configuration): Document GRUB_CMDLINE_XEN
and GRUB_CMDLINE_XEN_DEFAULT. Recommend setting
GRUB_GFXPAYLOAD_LINUX=text rather than unsetting it in order to
disable gfxpayload.
(Shell-like scripting): Add real content.
(Serial terminal): Suggest `terminal_input serial; terminal_output
serial' rather than putting the two commands on separate lines,
since console input will be inoperative after the first command.
(menuentry): Document --class, --users, and --hotkey options.
(terminfo): Describe what `visually-ordered UTF-8' means (thanks,
Vladimir Serbinenko).
Robert Millan [Sun, 1 Aug 2010 13:23:44 +0000 (15:23 +0200)]
2010-08-01 Robert Millan <rmh@gnu.org>
Prevent accidental use of uninitialized libzfs_handle.
* util/grub-probe.c (main): Move grub_util_init_libzfs() call to ...
* kern/emu/getroot.c (find_root_device_from_libzfs): ... here.
* util/misc.c (grub_util_init_libzfs): Make this function idempotent.
Robert Millan [Sat, 31 Jul 2010 10:22:01 +0000 (12:22 +0200)]
2010-07-31 Robert Millan <rmh@gnu.org>
* configure.ac: Check for `libzfs.h' and `libnvpair.h'.
* include/grub/util/libnvpair.h: Include `<config.h>'.
[HAVE_LIBNVPAIR_H]: Include `<libnvpair.h>' instead of
declaring libnvpair prototypes ourselves.
* include/grub/util/libzfs.h: Include `<config.h>'.
[HAVE_LIBZFS_H]: Include `<libzfs.h>' instead of
declaring libzfs prototypes ourselves.
(libzfs_handle): Moved to ...
* include/grub/util/misc.h (libzfs_handle): ... here.
Include `<grub/util/libzfs.h>'.
Robert Millan [Fri, 30 Jul 2010 19:43:12 +0000 (21:43 +0200)]
2010-07-30 Robert Millan <rmh@gnu.org>
Enable `grub-probe -t device' resolution on ZFS.
* configure.ac: Check for getfsstat(), libzfs and libnvpair.
* include/grub/util/libnvpair.h: New file.
* include/grub/util/libzfs.h: New file.
* kern/emu/getroot.c: Include `<assert.h>' and `<error.h>'.
[HAVE_LIBZFS && HAVE_LIBNVPAIR]: Include `<grub/util/libzfs.h>' and
`<grub/util/libnvpair.h>'.
[HAVE_GETFSSTAT]: Include `<sys/mount.h>'.
(find_mount_point_from_dir): New static function.
[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_root_device_from_libzfs): New
function.
[HAVE_LIBZFS && HAVE_LIBNVPAIR] (grub_guess_root_device): Use
find_root_device_from_libzfs() before ressorting to find_root_device().
* include/grub/util/misc.h (grub_util_init_libzfs): New function
prototype.
* util/misc.c: Include `<grub/util/libzfs.h>'.
(grub_util_init_libzfs): New function.
[HAVE_LIBZFS] (libzfs_handle): New global variable.
[HAVE_LIBZFS] (fini_libzfs): New static function.
(grub_util_init_libzfs): New function.
* util/grub-probe.c (main): Call grub_util_init_libzfs().
projects / grub2.git / log