2007-05-04 07:11:44 +00:00
|
|
|
#! /bin/sh -e
|
|
|
|
|
|
|
|
# Generate grub.cfg by inspecting /boot contents.
|
2009-06-03 13:53:10 +00:00
|
|
|
# Copyright (C) 2006,2007,2008,2009 Free Software Foundation, Inc.
|
2007-05-04 07:11:44 +00:00
|
|
|
#
|
2007-07-21 23:32:33 +00:00
|
|
|
# GRUB is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
2007-05-04 07:11:44 +00:00
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
2007-07-21 23:32:33 +00:00
|
|
|
# GRUB is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
2007-05-04 07:11:44 +00:00
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
2007-07-21 23:32:33 +00:00
|
|
|
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
2007-05-04 07:11:44 +00:00
|
|
|
|
|
|
|
transform="@program_transform_name@"
|
|
|
|
|
2007-05-11 15:53:02 +00:00
|
|
|
prefix=@prefix@
|
|
|
|
exec_prefix=@exec_prefix@
|
|
|
|
sbindir=@sbindir@
|
2007-05-20 09:10:06 +00:00
|
|
|
libdir=@libdir@
|
2007-05-04 07:11:44 +00:00
|
|
|
sysconfdir=@sysconfdir@
|
2009-07-26 11:03:57 +00:00
|
|
|
package_version=@PACKAGE_VERSION@
|
2009-08-07 12:18:03 +00:00
|
|
|
datadir=@datadir@
|
|
|
|
pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
|
2007-05-04 07:11:44 +00:00
|
|
|
grub_prefix=`echo /boot/grub | sed ${transform}`
|
2008-09-29 14:57:05 +00:00
|
|
|
grub_cfg=""
|
|
|
|
grub_mkconfig_dir=${sysconfdir}/grub.d
|
2007-05-11 15:53:02 +00:00
|
|
|
|
|
|
|
grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
|
|
|
|
grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
|
2007-05-04 07:11:44 +00:00
|
|
|
|
2008-02-09 12:31:11 +00:00
|
|
|
# Usage: usage
|
|
|
|
# Print the usage.
|
|
|
|
usage () {
|
|
|
|
cat <<EOF
|
|
|
|
Usage: $0 [OPTION]
|
2008-09-29 14:57:05 +00:00
|
|
|
Generate a grub config file
|
2008-02-09 12:31:11 +00:00
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
-o, --output=FILE output generated config to FILE [default=stdout]
|
2008-02-09 12:31:11 +00:00
|
|
|
-h, --help print this message and exit
|
|
|
|
-v, --version print the version information and exit
|
|
|
|
|
|
|
|
Report bugs to <bug-grub@gnu.org>.
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
|
|
|
|
# Check the arguments.
|
|
|
|
for option in "$@"; do
|
|
|
|
case "$option" in
|
|
|
|
-h | --help)
|
|
|
|
usage
|
|
|
|
exit 0 ;;
|
|
|
|
-v | --version)
|
2009-07-26 11:03:57 +00:00
|
|
|
echo "$0 (GNU GRUB ${package_version})"
|
2008-02-09 12:31:11 +00:00
|
|
|
exit 0 ;;
|
2008-09-29 14:57:05 +00:00
|
|
|
-o)
|
|
|
|
shift
|
|
|
|
grub_cfg=$1
|
|
|
|
;;
|
2009-06-13 09:23:54 +00:00
|
|
|
--output=*)
|
2008-09-29 14:57:05 +00:00
|
|
|
grub_cfg=`echo "$option" | sed 's/--output=//'`
|
2009-06-10 21:04:23 +00:00
|
|
|
;;
|
2008-02-09 12:31:11 +00:00
|
|
|
-*)
|
|
|
|
echo "Unrecognized option \`$option'" 1>&2
|
|
|
|
usage
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
. ${libdir}/grub/grub-mkconfig_lib
|
2007-05-20 09:10:06 +00:00
|
|
|
|
2008-06-16 20:29:55 +00:00
|
|
|
if [ "x$EUID" = "x" ] ; then
|
|
|
|
EUID=`id -u`
|
2007-05-04 07:11:44 +00:00
|
|
|
fi
|
|
|
|
|
2008-06-16 20:29:55 +00:00
|
|
|
if [ "$EUID" != 0 ] ; then
|
2008-07-29 15:38:05 +00:00
|
|
|
root=f
|
|
|
|
case "`uname 2>/dev/null`" in
|
|
|
|
CYGWIN*)
|
|
|
|
# Cygwin: Assume root if member of admin group
|
|
|
|
for g in `id -G 2>/dev/null` ; do
|
|
|
|
case $g in
|
|
|
|
0|544) root=t ;;
|
|
|
|
esac
|
|
|
|
done ;;
|
|
|
|
esac
|
|
|
|
if [ $root != t ] ; then
|
|
|
|
echo "$0: You must run this as root" >&2
|
|
|
|
exit 1
|
|
|
|
fi
|
2007-05-04 07:11:44 +00:00
|
|
|
fi
|
|
|
|
|
2007-05-11 15:53:02 +00:00
|
|
|
set $grub_mkdevicemap dummy
|
|
|
|
if test -f "$1"; then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
echo "$1: Not found." 1>&2
|
|
|
|
exit 1
|
2007-05-04 07:11:44 +00:00
|
|
|
fi
|
|
|
|
|
2007-05-11 15:53:02 +00:00
|
|
|
set $grub_probe dummy
|
|
|
|
if test -f "$1"; then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
echo "$1: Not found." 1>&2
|
|
|
|
exit 1
|
2007-05-04 07:11:44 +00:00
|
|
|
fi
|
|
|
|
|
2007-05-11 15:53:02 +00:00
|
|
|
mkdir -p ${grub_prefix}
|
|
|
|
|
|
|
|
if test -e ${grub_prefix}/device.map ; then : ; else
|
2009-02-22 21:55:49 +00:00
|
|
|
${grub_mkdevicemap}
|
2007-05-04 07:11:44 +00:00
|
|
|
fi
|
|
|
|
|
2007-12-30 08:52:06 +00:00
|
|
|
# Device containing our userland. Typically used for root= parameter.
|
2008-05-31 09:47:06 +00:00
|
|
|
GRUB_DEVICE="`${grub_probe} --target=device /`"
|
|
|
|
GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
|
2008-05-30 11:04:08 +00:00
|
|
|
|
|
|
|
# Device containing our /boot partition. Usually the same as GRUB_DEVICE.
|
2008-05-31 09:47:06 +00:00
|
|
|
GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
|
|
|
|
GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
|
2007-05-13 19:28:54 +00:00
|
|
|
|
|
|
|
# Filesystem for the device containing our userland. Used for stuff like
|
|
|
|
# choosing Hurd filesystem module.
|
2008-05-31 09:47:06 +00:00
|
|
|
GRUB_FS="`${grub_probe} --target=fs / 2> /dev/null || echo unknown`"
|
2007-05-13 19:28:54 +00:00
|
|
|
|
2007-05-04 07:11:44 +00:00
|
|
|
if test -f ${sysconfdir}/default/grub ; then
|
|
|
|
. ${sysconfdir}/default/grub
|
|
|
|
fi
|
|
|
|
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
Modularize at_keyboard.mod:
* conf/i386.rmk (pkglib_MODULES): Add `at_keyboard.mod'.
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): New variables.
Actual terminal split:
* include/grub/term.h (struct grub_term): Split in ...
(struct grub_term_input): ... this, and ...
(struct grub_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/term.c (grub_term_list): Split in ...
(grub_term_list_input): ... this, and ...
(grub_term_list_output): ... this. Update all users.
(grub_cur_term): Split in ...
(grub_cur_term_input): ... this, and ...
(grub_cur_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/misc.c (grub_abort): Split use of grub_term_get_current() into
a check for input and one for output (and only attempt to get keys
from user when input works).
* util/grub-probe.c (grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
* util/grub-fstest.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/grub-editenv.c: Likewise.
Portability adjustments:
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Remove
`term/i386/pc/at_keyboard.c'.
* kern/ieee1275/init.c [__i386__] (grub_machine_init): Remove call to
grub_keyboard_controller_init() (now handled by terminal .init).
* kern/i386/coreboot/init.c (grub_machine_init): Add call to
grub_at_keyboard_init().
* include/grub/i386/ieee1275/console.h (grub_keyboard_controller_init)
(grub_console_checkkey, grub_console_getkey): Remove (now provided by
at_keyboard.mod via input terminal interface).
* include/grub/i386/coreboot/console.h: Convert into a stub for
`<grub/i386/pc/console.h>'.
Migrate full terminals to new API:
* term/efi/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
* term/ieee1275/ofconsole.c: Remove __i386__ hack.
(grub_ofconsole_init): Split into ...
(grub_ofconsole_init_input): ... this, and ...
(grub_ofconsole_init_output): ... this.
(grub_ofconsole_term): Split into ...
(grub_ofconsole_term_input): ... this, and ...
(grub_ofconsole_term_output): ... this. Update all users.
* term/i386/pc/serial.c (grub_serial_term): Split into ...
(grub_serial_term_input): ... this, and ...
(grub_serial_term_output): ... this. Update all users.
* term/i386/pc/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
(grub_console_term_input): Only enable it on PC/BIOS platform.
(grub_console_init): Remove grub_keyboard_controller_init() call.
Migrate input terminals to new API:
* term/i386/pc/at_keyboard.c: Replace `cpu' and `machine' with
`i386' and `i386/pc' to enable build on x86_64 (this driver is
i386-specific anyway).
(grub_console_checkkey): Rename to ...
(grub_at_keyboard_checkkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_orig): New variable.
(grub_console_getkey): Rename to ...
(grub_at_keyboard_getkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_init): Static-ize. Save original
controller value so that it can be restored ...
(grub_keyboard_controller_fini): ... here (new function).
(grub_at_keyboard_term): New structure.
(GRUB_MOD_INIT(at_keyboard), GRUB_MOD_FINI(at_keyboard)): New
functions.
Migrate output terminals to new API:
* term/i386/pc/vga.c (grub_vga_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* term/gfxterm.c (grub_video_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* include/grub/i386/pc/console.h (grub_console_checkkey)
(grub_console_getkey): Do not export (no longer needed by gfxterm,
etc).
Migrate `terminal' command and userland tools to new API:
* commands/terminal.c (grub_cmd_terminal): Split into ...
(grub_cmd_terminal_input): ... this, and ...
(grub_cmd_terminal_output): ... this.
(GRUB_MOD_INIT(terminal)): Split `terminal' command in two commands:
`terminal_input' and `terminal_output'.
* util/grub.d/00_header.in: Adjust `terminal' calls to new
`terminal_input' / `terminal_output' API.
* util/grub-mkconfig.in: Export ${GRUB_TERMINAL_INPUT} and
${GRUB_TERMINAL_OUTPUT} instead of ${GRUB_TERMINAL} (and if user
provided ${GRUB_TERMINAL}, convert it).
2008-11-07 19:11:39 +00:00
|
|
|
# XXX: should this be deprecated at some point?
|
|
|
|
if [ "x${GRUB_TERMINAL}" != "x" ] ; then
|
|
|
|
GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}"
|
|
|
|
GRUB_TERMINAL_OUTPUT="${GRUB_TERMINAL}"
|
|
|
|
fi
|
|
|
|
|
|
|
|
case x${GRUB_TERMINAL_OUTPUT} in
|
2008-08-03 16:38:40 +00:00
|
|
|
x)
|
|
|
|
# If this platform supports gfxterm, try to use it.
|
|
|
|
if test -e ${grub_prefix}/gfxterm.mod ; then
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
Modularize at_keyboard.mod:
* conf/i386.rmk (pkglib_MODULES): Add `at_keyboard.mod'.
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): New variables.
Actual terminal split:
* include/grub/term.h (struct grub_term): Split in ...
(struct grub_term_input): ... this, and ...
(struct grub_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/term.c (grub_term_list): Split in ...
(grub_term_list_input): ... this, and ...
(grub_term_list_output): ... this. Update all users.
(grub_cur_term): Split in ...
(grub_cur_term_input): ... this, and ...
(grub_cur_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/misc.c (grub_abort): Split use of grub_term_get_current() into
a check for input and one for output (and only attempt to get keys
from user when input works).
* util/grub-probe.c (grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
* util/grub-fstest.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/grub-editenv.c: Likewise.
Portability adjustments:
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Remove
`term/i386/pc/at_keyboard.c'.
* kern/ieee1275/init.c [__i386__] (grub_machine_init): Remove call to
grub_keyboard_controller_init() (now handled by terminal .init).
* kern/i386/coreboot/init.c (grub_machine_init): Add call to
grub_at_keyboard_init().
* include/grub/i386/ieee1275/console.h (grub_keyboard_controller_init)
(grub_console_checkkey, grub_console_getkey): Remove (now provided by
at_keyboard.mod via input terminal interface).
* include/grub/i386/coreboot/console.h: Convert into a stub for
`<grub/i386/pc/console.h>'.
Migrate full terminals to new API:
* term/efi/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
* term/ieee1275/ofconsole.c: Remove __i386__ hack.
(grub_ofconsole_init): Split into ...
(grub_ofconsole_init_input): ... this, and ...
(grub_ofconsole_init_output): ... this.
(grub_ofconsole_term): Split into ...
(grub_ofconsole_term_input): ... this, and ...
(grub_ofconsole_term_output): ... this. Update all users.
* term/i386/pc/serial.c (grub_serial_term): Split into ...
(grub_serial_term_input): ... this, and ...
(grub_serial_term_output): ... this. Update all users.
* term/i386/pc/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
(grub_console_term_input): Only enable it on PC/BIOS platform.
(grub_console_init): Remove grub_keyboard_controller_init() call.
Migrate input terminals to new API:
* term/i386/pc/at_keyboard.c: Replace `cpu' and `machine' with
`i386' and `i386/pc' to enable build on x86_64 (this driver is
i386-specific anyway).
(grub_console_checkkey): Rename to ...
(grub_at_keyboard_checkkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_orig): New variable.
(grub_console_getkey): Rename to ...
(grub_at_keyboard_getkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_init): Static-ize. Save original
controller value so that it can be restored ...
(grub_keyboard_controller_fini): ... here (new function).
(grub_at_keyboard_term): New structure.
(GRUB_MOD_INIT(at_keyboard), GRUB_MOD_FINI(at_keyboard)): New
functions.
Migrate output terminals to new API:
* term/i386/pc/vga.c (grub_vga_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* term/gfxterm.c (grub_video_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* include/grub/i386/pc/console.h (grub_console_checkkey)
(grub_console_getkey): Do not export (no longer needed by gfxterm,
etc).
Migrate `terminal' command and userland tools to new API:
* commands/terminal.c (grub_cmd_terminal): Split into ...
(grub_cmd_terminal_input): ... this, and ...
(grub_cmd_terminal_output): ... this.
(GRUB_MOD_INIT(terminal)): Split `terminal' command in two commands:
`terminal_input' and `terminal_output'.
* util/grub.d/00_header.in: Adjust `terminal' calls to new
`terminal_input' / `terminal_output' API.
* util/grub-mkconfig.in: Export ${GRUB_TERMINAL_INPUT} and
${GRUB_TERMINAL_OUTPUT} instead of ${GRUB_TERMINAL} (and if user
provided ${GRUB_TERMINAL}, convert it).
2008-11-07 19:11:39 +00:00
|
|
|
GRUB_TERMINAL_OUTPUT=gfxterm
|
2008-08-03 16:38:40 +00:00
|
|
|
fi
|
|
|
|
;;
|
|
|
|
xconsole | xserial | xofconsole | xgfxterm) ;;
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
Modularize at_keyboard.mod:
* conf/i386.rmk (pkglib_MODULES): Add `at_keyboard.mod'.
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): New variables.
Actual terminal split:
* include/grub/term.h (struct grub_term): Split in ...
(struct grub_term_input): ... this, and ...
(struct grub_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/term.c (grub_term_list): Split in ...
(grub_term_list_input): ... this, and ...
(grub_term_list_output): ... this. Update all users.
(grub_cur_term): Split in ...
(grub_cur_term_input): ... this, and ...
(grub_cur_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/misc.c (grub_abort): Split use of grub_term_get_current() into
a check for input and one for output (and only attempt to get keys
from user when input works).
* util/grub-probe.c (grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
* util/grub-fstest.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/grub-editenv.c: Likewise.
Portability adjustments:
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Remove
`term/i386/pc/at_keyboard.c'.
* kern/ieee1275/init.c [__i386__] (grub_machine_init): Remove call to
grub_keyboard_controller_init() (now handled by terminal .init).
* kern/i386/coreboot/init.c (grub_machine_init): Add call to
grub_at_keyboard_init().
* include/grub/i386/ieee1275/console.h (grub_keyboard_controller_init)
(grub_console_checkkey, grub_console_getkey): Remove (now provided by
at_keyboard.mod via input terminal interface).
* include/grub/i386/coreboot/console.h: Convert into a stub for
`<grub/i386/pc/console.h>'.
Migrate full terminals to new API:
* term/efi/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
* term/ieee1275/ofconsole.c: Remove __i386__ hack.
(grub_ofconsole_init): Split into ...
(grub_ofconsole_init_input): ... this, and ...
(grub_ofconsole_init_output): ... this.
(grub_ofconsole_term): Split into ...
(grub_ofconsole_term_input): ... this, and ...
(grub_ofconsole_term_output): ... this. Update all users.
* term/i386/pc/serial.c (grub_serial_term): Split into ...
(grub_serial_term_input): ... this, and ...
(grub_serial_term_output): ... this. Update all users.
* term/i386/pc/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
(grub_console_term_input): Only enable it on PC/BIOS platform.
(grub_console_init): Remove grub_keyboard_controller_init() call.
Migrate input terminals to new API:
* term/i386/pc/at_keyboard.c: Replace `cpu' and `machine' with
`i386' and `i386/pc' to enable build on x86_64 (this driver is
i386-specific anyway).
(grub_console_checkkey): Rename to ...
(grub_at_keyboard_checkkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_orig): New variable.
(grub_console_getkey): Rename to ...
(grub_at_keyboard_getkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_init): Static-ize. Save original
controller value so that it can be restored ...
(grub_keyboard_controller_fini): ... here (new function).
(grub_at_keyboard_term): New structure.
(GRUB_MOD_INIT(at_keyboard), GRUB_MOD_FINI(at_keyboard)): New
functions.
Migrate output terminals to new API:
* term/i386/pc/vga.c (grub_vga_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* term/gfxterm.c (grub_video_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* include/grub/i386/pc/console.h (grub_console_checkkey)
(grub_console_getkey): Do not export (no longer needed by gfxterm,
etc).
Migrate `terminal' command and userland tools to new API:
* commands/terminal.c (grub_cmd_terminal): Split into ...
(grub_cmd_terminal_input): ... this, and ...
(grub_cmd_terminal_output): ... this.
(GRUB_MOD_INIT(terminal)): Split `terminal' command in two commands:
`terminal_input' and `terminal_output'.
* util/grub.d/00_header.in: Adjust `terminal' calls to new
`terminal_input' / `terminal_output' API.
* util/grub-mkconfig.in: Export ${GRUB_TERMINAL_INPUT} and
${GRUB_TERMINAL_OUTPUT} instead of ${GRUB_TERMINAL} (and if user
provided ${GRUB_TERMINAL}, convert it).
2008-11-07 19:11:39 +00:00
|
|
|
*) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
|
2007-06-23 19:34:57 +00:00
|
|
|
esac
|
|
|
|
|
|
|
|
# check for terminals that require fonts
|
2008-11-07 Robert Millan <rmh@aybabtu.com>
Modularize at_keyboard.mod:
* conf/i386.rmk (pkglib_MODULES): Add `at_keyboard.mod'.
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): New variables.
Actual terminal split:
* include/grub/term.h (struct grub_term): Split in ...
(struct grub_term_input): ... this, and ...
(struct grub_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/term.c (grub_term_list): Split in ...
(grub_term_list_input): ... this, and ...
(grub_term_list_output): ... this. Update all users.
(grub_cur_term): Split in ...
(grub_cur_term_input): ... this, and ...
(grub_cur_term_output): ... this. Update all users.
(grub_term_set_current): Split in ...
(grub_term_set_current_input): ... this, and ...
(grub_term_set_current_output): ... this.
(grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
(grub_term_register): Split in ...
(grub_term_register_input): ... this, and ...
(grub_term_register_output): ... this.
(grub_term_unregister): Split in ...
(grub_term_unregister_input): ... this, and ...
(grub_term_unregister_output): ... this.
(grub_term_iterate): Split in ...
(grub_term_iterate_input): ... this, and ...
(grub_term_iterate_output): ... this.
* kern/misc.c (grub_abort): Split use of grub_term_get_current() into
a check for input and one for output (and only attempt to get keys
from user when input works).
* util/grub-probe.c (grub_term_get_current): Split in ...
(grub_term_get_current_input): ... this, and ...
(grub_term_get_current_output): ... this.
* util/grub-fstest.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/grub-editenv.c: Likewise.
Portability adjustments:
* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Remove
`term/i386/pc/at_keyboard.c'.
* kern/ieee1275/init.c [__i386__] (grub_machine_init): Remove call to
grub_keyboard_controller_init() (now handled by terminal .init).
* kern/i386/coreboot/init.c (grub_machine_init): Add call to
grub_at_keyboard_init().
* include/grub/i386/ieee1275/console.h (grub_keyboard_controller_init)
(grub_console_checkkey, grub_console_getkey): Remove (now provided by
at_keyboard.mod via input terminal interface).
* include/grub/i386/coreboot/console.h: Convert into a stub for
`<grub/i386/pc/console.h>'.
Migrate full terminals to new API:
* term/efi/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
* term/ieee1275/ofconsole.c: Remove __i386__ hack.
(grub_ofconsole_init): Split into ...
(grub_ofconsole_init_input): ... this, and ...
(grub_ofconsole_init_output): ... this.
(grub_ofconsole_term): Split into ...
(grub_ofconsole_term_input): ... this, and ...
(grub_ofconsole_term_output): ... this. Update all users.
* term/i386/pc/serial.c (grub_serial_term): Split into ...
(grub_serial_term_input): ... this, and ...
(grub_serial_term_output): ... this. Update all users.
* term/i386/pc/console.c (grub_console_term): Split into ...
(grub_console_term_input): ... this, and ...
(grub_console_term_output): ... this. Update all users.
(grub_console_term_input): Only enable it on PC/BIOS platform.
(grub_console_init): Remove grub_keyboard_controller_init() call.
Migrate input terminals to new API:
* term/i386/pc/at_keyboard.c: Replace `cpu' and `machine' with
`i386' and `i386/pc' to enable build on x86_64 (this driver is
i386-specific anyway).
(grub_console_checkkey): Rename to ...
(grub_at_keyboard_checkkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_orig): New variable.
(grub_console_getkey): Rename to ...
(grub_at_keyboard_getkey): ... this. Static-ize. Update all
users.
(grub_keyboard_controller_init): Static-ize. Save original
controller value so that it can be restored ...
(grub_keyboard_controller_fini): ... here (new function).
(grub_at_keyboard_term): New structure.
(GRUB_MOD_INIT(at_keyboard), GRUB_MOD_FINI(at_keyboard)): New
functions.
Migrate output terminals to new API:
* term/i386/pc/vga.c (grub_vga_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* term/gfxterm.c (grub_video_term): Change type to
`struct grub_term_output'. Remove `.checkkey' and `.getkey'
members. Update all users.
* include/grub/i386/pc/console.h (grub_console_checkkey)
(grub_console_getkey): Do not export (no longer needed by gfxterm,
etc).
Migrate `terminal' command and userland tools to new API:
* commands/terminal.c (grub_cmd_terminal): Split into ...
(grub_cmd_terminal_input): ... this, and ...
(grub_cmd_terminal_output): ... this.
(GRUB_MOD_INIT(terminal)): Split `terminal' command in two commands:
`terminal_input' and `terminal_output'.
* util/grub.d/00_header.in: Adjust `terminal' calls to new
`terminal_input' / `terminal_output' API.
* util/grub-mkconfig.in: Export ${GRUB_TERMINAL_INPUT} and
${GRUB_TERMINAL_OUTPUT} instead of ${GRUB_TERMINAL} (and if user
provided ${GRUB_TERMINAL}, convert it).
2008-11-07 19:11:39 +00:00
|
|
|
case ${GRUB_TERMINAL_OUTPUT} in
|
2007-06-23 19:34:57 +00:00
|
|
|
gfxterm)
|
2009-08-07 12:18:03 +00:00
|
|
|
for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
|
|
|
|
for basename in unicode unifont ascii; do
|
|
|
|
path="${dir}/${basename}.pf2"
|
|
|
|
if is_path_readable_by_grub ${path} > /dev/null ; then
|
|
|
|
GRUB_FONT_PATH=${path}
|
|
|
|
else
|
|
|
|
continue
|
|
|
|
fi
|
|
|
|
if [ "${basename}" = "ascii"] ; then
|
|
|
|
# make sure all our children behave in conformance with ascii..
|
|
|
|
export LANG=C
|
|
|
|
fi
|
|
|
|
break 2
|
|
|
|
done
|
|
|
|
done
|
|
|
|
if [ -z "${GRUB_FONT_PATH}" ] ; then
|
|
|
|
# fallback to the native terminal for this platform
|
|
|
|
unset GRUB_TERMINAL_OUTPUT
|
|
|
|
fi
|
2007-06-23 19:34:57 +00:00
|
|
|
;;
|
2008-08-03 16:38:40 +00:00
|
|
|
*)
|
2007-06-23 19:34:57 +00:00
|
|
|
# make sure all our children behave in conformance with ascii..
|
|
|
|
export LANG=C
|
|
|
|
esac
|
|
|
|
|
2007-05-13 19:28:54 +00:00
|
|
|
# These are defined in this script, export them here so that user can
|
|
|
|
# override them.
|
2008-05-30 11:04:08 +00:00
|
|
|
export GRUB_DEVICE GRUB_DEVICE_UUID GRUB_DEVICE_BOOT GRUB_DEVICE_BOOT_UUID GRUB_FS GRUB_FONT_PATH GRUB_PRELOAD_MODULES
|
2007-05-13 19:28:54 +00:00
|
|
|
|
|
|
|
# These are optional, user-defined variables.
|
2009-06-21 11:21:59 +00:00
|
|
|
export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL_INPUT GRUB_TERMINAL_OUTPUT GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_DISABLE_LINUX_RECOVERY GRUB_GFXMODE
|
2007-05-13 19:28:54 +00:00
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
if test "x${grub_cfg}" != "x"; then
|
|
|
|
rm -f ${grub_cfg}.new
|
|
|
|
exec > ${grub_cfg}.new
|
2007-05-13 19:28:54 +00:00
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
# Allow this to fail, since /boot/grub/ might need to be fatfs to support some
|
|
|
|
# firmware implementations (e.g. OFW or EFI).
|
|
|
|
chmod 444 ${grub_cfg}.new || true
|
|
|
|
fi
|
|
|
|
echo "Generating grub.cfg ..." >&2
|
2007-05-04 07:11:44 +00:00
|
|
|
|
|
|
|
cat << EOF
|
|
|
|
#
|
|
|
|
# DO NOT EDIT THIS FILE
|
|
|
|
#
|
2007-12-30 08:52:06 +00:00
|
|
|
# It is automatically generated by $0 using templates
|
2009-06-03 13:53:10 +00:00
|
|
|
# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
|
2007-05-04 07:11:44 +00:00
|
|
|
#
|
|
|
|
EOF
|
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
for i in ${grub_mkconfig_dir}/* ; do
|
2007-11-05 16:22:30 +00:00
|
|
|
case "$i" in
|
2007-05-04 07:11:44 +00:00
|
|
|
# emacsen backup files. FIXME: support other editors
|
|
|
|
*~) ;;
|
|
|
|
*)
|
2008-01-10 13:52:24 +00:00
|
|
|
if grub_file_is_not_garbage "$i" && test -x "$i" ; then
|
2007-05-04 07:11:44 +00:00
|
|
|
echo
|
|
|
|
echo "### BEGIN $i ###"
|
2007-11-05 16:22:30 +00:00
|
|
|
"$i"
|
2007-05-04 07:11:44 +00:00
|
|
|
echo "### END $i ###"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
if test "x${grub_cfg}" != "x" ; then
|
|
|
|
# none of the children aborted with error, install the new grub.cfg
|
|
|
|
mv -f ${grub_cfg}.new ${grub_cfg}
|
|
|
|
fi
|
2007-05-04 07:11:44 +00:00
|
|
|
|
|
|
|
echo "done" >&2
|