* util/grub-mkconfig_lib.in (prepare_grub_to_access_device):

Don't add "root" line if no compatibility hont is available.
	Suggested by: Seth Goldberg.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-01-29 20:52:37 +01:00
parent 2b5336a24a
commit ebe2c96154
2 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2012-01-29 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkconfig_lib.in (prepare_grub_to_access_device):
Don't add "root" line if no compatibility hont is available.
Suggested by: Seth Goldberg.
2012-01-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-01-29 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/ata.h (grub_ata): Add a new element maxbuffer. * include/grub/ata.h (grub_ata): Add a new element maxbuffer.

View file

@ -146,7 +146,10 @@ prepare_grub_to_access_device ()
# If there's a filesystem UUID that GRUB is capable of identifying, use it; # If there's a filesystem UUID that GRUB is capable of identifying, use it;
# otherwise set root as per value in device.map. # otherwise set root as per value in device.map.
echo "set root='`"${grub_probe}" --device "${device}" --target=compatibility_hint`'" fs_hint="`"${grub_probe}" --device "${device}" --target=compatibility_hint`"
if [ "x$fs_hint" != x ]; then
echo "set root='$fs_hint'"
fi
if fs_uuid="`"${grub_probe}" --device "${device}" --target=fs_uuid 2> /dev/null`" ; then if fs_uuid="`"${grub_probe}" --device "${device}" --target=fs_uuid 2> /dev/null`" ; then
hints="`"${grub_probe}" --device "${device}" --target=hints_string 2> /dev/null`" hints="`"${grub_probe}" --device "${device}" --target=hints_string 2> /dev/null`"
echo "if [ x\$feature_platform_search_hint = xy ]; then" echo "if [ x\$feature_platform_search_hint = xy ]; then"