From 3c62a39d26e236a11a2b2dc6ad313d7dec7a86f2 Mon Sep 17 00:00:00 2001 From: robertmh Date: Thu, 19 Jun 2008 12:29:44 +0000 Subject: [PATCH] 2008-06-19 Robert Millan * util/update-grub_lib.in (prepare_grub_to_access_device): Issue "insmod" command directly when abstraction modules are needed, instead of reliing on GRUB_PRELOAD_MODULES (which had no effect since it had already been processed). --- ChangeLog | 7 +++++++ util/update-grub_lib.in | 9 ++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e1bf307e..f28519489 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-19 Robert Millan + + * util/update-grub_lib.in (prepare_grub_to_access_device): Issue + "insmod" command directly when abstraction modules are needed, + instead of reliing on GRUB_PRELOAD_MODULES (which had no effect + since it had already been processed). + 2008-06-19 Pavel Roskin * conf/i386-efi.rmk: Recompile grub-mkimage.c if Makefile has diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in index 76b7460a1..b7d141e4e 100644 --- a/util/update-grub_lib.in +++ b/util/update-grub_lib.in @@ -120,15 +120,18 @@ prepare_grub_to_access_device () return fi + # Abstraction modules aren't auto-loaded. + abstraction="`${grub_probe} --device ${device} --target=abstraction`" + if [ "x${abstraction}" = "x" ] ; then : ; else + echo "insmod ${abstraction}" + fi + # If there's a filesystem UUID that GRUB is capable of identifiing, use it; # otherwise set root as per value in device.map. echo "set root=`${grub_probe} --device ${device} --target=drive`" if fs_uuid="`${grub_probe} --device ${device} --target=fs_uuid 2> /dev/null`" ; then echo "search --fs-uuid --set ${fs_uuid}" fi - - # Abstraction modules aren't auto-loaded. - GRUB_PRELOAD_MODULES="${GRUB_PRELOAD_MODULES} `${grub_probe} --device ${device} --target=abstraction`" } font_path ()