]> git.ipfire.org Git - thirdparty/grub.git/commit
Fix menu title instability bug.
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 4 Mar 2012 13:55:13 +0000 (14:55 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 4 Mar 2012 13:55:13 +0000 (14:55 +0100)
commitd9bef9bc433ee4f95d8b4124efa7afb119c08730
tree646606dddc4237e0a99cc8e7f06a171893a22891
parent0d31b7df8661983af9e282cee15c9a81842162a8
Fix menu title instability bug.

* grub-core/commands/menuentry.c (options): New option --id.
(grub_normal_add_menu_entry): New argument id. All users updated.
(grub_cmd_menuentry): Handle --id.
(grub_menu_init): Accept unknown arguments.
* grub-core/normal/main.c (features): Add feature_menuentry_id and
feature_menuentry_options.
* grub-core/normal/menu.c (grub_menu_execute_entry): Use id for
saved_entry.
(get_entry_number): Match with id as well.
* include/grub/menu.h (grub_menu_entry): New member id.
* util/grub-mkconfig_lib.in (grub_get_device_id): New function.
* util/grub.d/00_header.in: Define menuentry_id_option.
* util/grub.d/10_hurd.in: Define id.
* util/grub.d/10_illumos.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/10_netbsd.in: Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.
17 files changed:
ChangeLog
grub-core/commands/legacycfg.c
grub-core/commands/menuentry.c
grub-core/normal/main.c
grub-core/normal/menu.c
include/grub/menu.h
include/grub/normal.h
util/grub-mkconfig_lib.in
util/grub.d/00_header.in
util/grub.d/10_hurd.in
util/grub.d/10_illumos.in
util/grub.d/10_kfreebsd.in
util/grub.d/10_linux.in
util/grub.d/10_netbsd.in
util/grub.d/10_windows.in
util/grub.d/20_linux_xen.in
util/grub.d/30_os-prober.in