vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub-install.in: Fix install non-PreP IEEE1275 install.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-09 00:58:55 +01:00
parent 5fd1c522d4
commit dd3907779e
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-03-09 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: Fix install non-PreP IEEE1275 install.
2012-03-09 Vladimir Serbinenko <phcoder@gmail.com> 2012-03-09 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/i386/pc/sendkey.c (GRUB_MOD_INIT): Fix confusing * grub-core/commands/i386/pc/sendkey.c (GRUB_MOD_INIT): Fix confusing

23
util/grub-install.in
View file

@ -727,22 +727,23 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
echo "$1: Not found." 1>&2 echo "$1: Not found." 1>&2
exit 1 exit 1
fi fi
# Get the Open Firmware device tree path translation. if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" != "powerpc-ieee1275" ] \
dev="`echo $install_device | sed -e 's/\/dev\///' -e 's/[0-9]\+//'`" || [ -z "${install_device}" ]; then
partno="`echo $install_device | sed -e 's/.*[^0-9]\([0-9]\+\)$/\1/'`" # Get the Open Firmware device tree path translation.
ofpath="`$ofpathname $dev`" || { dev="`echo $grub_device | sed -e 's/\/dev\///' -e 's/[0-9]\+//'`"
partno="`echo $grub_device | sed -e 's/.*[^0-9]\([0-9]\+\)$/\1/'`"
ofpath="`$ofpathname $dev`" || {
# TRANSLATORS: "device tree path" is the name of the device # TRANSLATORS: "device tree path" is the name of the device
# for IEEE1275 # 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 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 exit 1
} }
# Point boot-device at the new grub install # Point boot-device at the new grub install
boot_device="$ofpath:$partno,"`"$grub_mkrelpath" "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" | sed 's,/,\\\\,g'` boot_device="$ofpath:$partno,"`"$grub_mkrelpath" "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" | sed 's,/,\\\\,g'`
# If a install device is defined, copy the core.elf to PReP partition. # If a install device is defined, copy the core.elf to PReP partition.
if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "powerpc-ieee1275" ] \ else
&& [ -n "${install_device}" ]; then
if [ "$("${grub_probe}" -m "${device_map}" -d "${install_device}" -t msdos_parttype)" != "41" ]; then if [ "$("${grub_probe}" -m "${device_map}" -d "${install_device}" -t msdos_parttype)" != "41" ]; then
gettext "The chosen partition is not a PReP partition." 1>&2 gettext "The chosen partition is not a PReP partition." 1>&2
echo 1>&2 echo 1>&2