2008-06-19 Robert Millan <rmh@aybabtu.com>

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

diff --git a/ChangeLog b/ChangeLog
index 2e1bf307e012ff6e59465ea95a8fa9397a011e79..f28519489d60b67e8c81a91535e914dcadc5486d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-19  Robert Millan  <rmh@aybabtu.com>
+
+       * 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  <proski@gnu.org>
 
        * 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 76b7460a13597a56e1eb42f2d6b3eab62592dd5e..b7d141e4ec8f07fff2e3fe264485e9a85896cf29 100644 (file)
--- 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 ()