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.
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

View file

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