* util/grub-install.in: Fix nvram call for PreP.

diff --git a/ChangeLog b/ChangeLog
index cfc84c36556345adce84d83b61e4cdb290903dd0..f8041d05ebd310d090d402c2f4a36b9ad80ad37e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-install.in: Fix nvram call for PreP.
+
 2012-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/diskfilter.c (grub_diskfilter_memberlist): Degrade

diff --git a/util/grub-install.in b/util/grub-install.in
index 9c1d1338b2ed61a08e8d14021659c22676065b94..92288950fe7391c5c959f714d2005bbd691b8d7d 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -764,6 +764,13 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
                echo "  dd if=/dev/zero of=${install_device}"
                exit 1
             fi
+           dev="`echo "${install_device}" | sed -e 's/\/dev\///' -e 's/[0-9]\+//'`"
+           boot_device="`$ofpathname "$dev"`" || {
+           # TRANSLATORS: "device tree path" is the name of the device
+            # for IEEE1275
+               gettext_printf "Couldn't find IEEE1275 device tree path for %s.\nYou will have to set \`boot-device' variable manually.\n" "$dev" 1>&2
+               exit 1
+           }
        fi
 
        "$nvsetenv" boot-device "$boot_device" || {