From 6753c0ec3a48accfc303db7930169d178524b751 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 24 Feb 2012 12:35:38 +0100 Subject: [PATCH] * util/grub-install.in: Fix usage of wrong device for PreP install. --- ChangeLog | 4 ++++ util/grub-install.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29f25d266..627938fbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-02-24 Vladimir Serbinenko + + * util/grub-install.in: Fix usage of wrong device for PreP install. + 2012-02-24 Vladimir Serbinenko * conf/Makefile.common (CFLAGS_GNULIB): Add diff --git a/util/grub-install.in b/util/grub-install.in index cbb37ead2..52e2f16f5 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -643,8 +643,8 @@ elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${pla exit 1 fi # Get the Open Firmware device tree path translation. - dev="`echo $grub_device | sed -e 's/\/dev\///' -e 's/[0-9]\+//'`" - partno="`echo $grub_device | sed -e 's/.*[^0-9]\([0-9]\+\)$/\1/'`" + dev="`echo $install_device | sed -e 's/\/dev\///' -e 's/[0-9]\+//'`" + partno="`echo $install_device | sed -e 's/.*[^0-9]\([0-9]\+\)$/\1/'`" ofpath="`$ofpathname $dev`" || { 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