* util/ieee1275/grub-install.in: Don't use empty grub_device.

	Reported by: Lennart Sorensen.

diff --git a/ChangeLog b/ChangeLog
index de1edebb18d1de5f3500668e959cbd688429b822..a2b6a2bc14725e33f8211615bc8fff6296a30df4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/ieee1275/grub-install.in: Don't use empty grub_device.
+       Reported by: Lennart Sorensen.
+
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub.d/00_header.in: Remove compatibility with terminal.mod
+       prior to terminal_input/terminal_output separation. It's been over 1.5
+       years and those versions weren't widely deployed.
+
 2010-07-22  Colin Watson  <cjwatson@ubuntu.com>
 
        * disk/raid.c (insert_array): Don't count named arrays when looking
@@ -29,12 +40,6 @@
        (grub_efi_console_fini): New function.
        (grub_console_term_output): Register init and fini methods.
 
-2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
-
-       * util/grub.d/00_header.in: Remove compatibility with terminal.mod
-       prior to terminal_input/terminal_output separation. It's been over 1.5
-       years and those versions weren't widely deployed.
-
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * tests/util/grub-shell-tester.in: Remove bashism and declare as

diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 98fd5d65a31f6a9b04894107e3cba170e2468884..98de5f34889c7ecd23fd7f3d03b2933427bc56e7 100644 (file)
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -212,7 +212,7 @@ fi
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
 partmap_module=
-for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+for x in `$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`; do
    partmap_module="$partmap_module part_$x";
 done