vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2012-02-19 Samuel Thibault <samuel.thibault@ens-lyon.org>

Browse source 
* util/grub-mkconfig.in (GRUB_CMDLINE_GNUMACH): Export variable.
	* util/grub.d/10_hurd.in: Include GRUB_CMDLINE_GNUMACH in gnumach
	command line.
	* docs/grub.texi (Simple configuration): Document
	GRUB_CMDLINE_GNUMACH.
This commit is contained in:
Samuel Thibault 2012-02-19 17:06:00 +01:00
parent 80a7121355
commit ac96441c81
4 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,4 +1,12 @@
2012-02-18 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-19 Samuel Thibault <samuel.thibault@ens-lyon.org>
* util/grub-mkconfig.in (GRUB_CMDLINE_GNUMACH): Export variable.
* util/grub.d/10_hurd.in: Include GRUB_CMDLINE_GNUMACH in gnumach
command line.
* docs/grub.texi (Simple configuration): Document
GRUB_CMDLINE_GNUMACH.
2012-02-18 Vladimir Serbinenko <phcoder@gmail.com>
* conf/Makefile.common (platform_SCRIPTS): New variable. * conf/Makefile.common (platform_SCRIPTS): New variable.
(platform_PROGRAMS): Likewise. (platform_PROGRAMS): Likewise.
@ -7,14 +15,14 @@
* grub-core/Makefile.core.def (gdb_grub): Mark for install. * grub-core/Makefile.core.def (gdb_grub): Mark for install.
(gmodule.pl): Likewise. (gmodule.pl): Likewise.
2012-02-18 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-18 Vladimir Serbinenko <phcoder@gmail.com>
Replace grub_checkkey with grub_getkey_noblock. Replace grub_checkkey with grub_getkey_noblock.
* grub-core/kern/term.c (grub_checkkey): Replaced with ... * grub-core/kern/term.c (grub_checkkey): Replaced with ...
(grub_getkey_noblock): ... this. All users updated. (grub_getkey_noblock): ... this. All users updated.
2012-02-18 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/emu/console.c: Move to ... * grub-core/kern/emu/console.c: Move to ...
* grub-core/term/emu/console.c: ...here. * grub-core/term/emu/console.c: ...here.

3
docs/grub.texi
View file

@ -1202,6 +1202,9 @@ only to the default menu entry, after those listed in
As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, but for As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, but for
NetBSD. NetBSD.
@item GRUB_CMDLINE_GNUMACH
As @samp{GRUB_CMDLINE_LINUX}, but for GNU Mach.
@item GRUB_CMDLINE_XEN @item GRUB_CMDLINE_XEN
@itemx GRUB_CMDLINE_XEN_DEFAULT @itemx GRUB_CMDLINE_XEN_DEFAULT
The values of these options are appended to the values of The values of these options are appended to the values of

1
util/grub-mkconfig.in
View file

@ -231,6 +231,7 @@ export GRUB_DEFAULT \
GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT \ GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT \
GRUB_CMDLINE_NETBSD \ GRUB_CMDLINE_NETBSD \
GRUB_CMDLINE_NETBSD_DEFAULT \ GRUB_CMDLINE_NETBSD_DEFAULT \
GRUB_CMDLINE_GNUMACH \
GRUB_TERMINAL_INPUT \ GRUB_TERMINAL_INPUT \
GRUB_TERMINAL_OUTPUT \ GRUB_TERMINAL_OUTPUT \
GRUB_SERIAL_COMMAND \ GRUB_SERIAL_COMMAND \

4
util/grub.d/10_hurd.in
View file

@ -87,7 +87,7 @@ EOF
message="$(gettext_printf "Loading GNU Mach ...")" message="$(gettext_printf "Loading GNU Mach ...")"
cat << EOF cat << EOF
echo '$message' echo '$message'
multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} ${GRUB_CMDLINE_GNUMACH}
EOF EOF
save_default_entry | sed -e "s/^/\t/" save_default_entry | sed -e "s/^/\t/"
prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
@ -111,7 +111,7 @@ EOF
message="$(gettext_printf "Loading GNU Mach ...")" message="$(gettext_printf "Loading GNU Mach ...")"
cat << EOF cat << EOF
echo '$message' echo '$message'
multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} -s multiboot ${kernel} root=device:${GRUB_DEVICE#/dev/} -s ${GRUB_CMDLINE_GNUMACH}
EOF EOF
prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/" prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
message="$(gettext_printf "Loading the Hurd ...")" message="$(gettext_printf "Loading the Hurd ...")"