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

Fix several powerpc-ieee1275 issues and one EFI one while on it

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-06 23:03:25 +02:00
parent 861d5b5c72
commit 88ae2ce160
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
util/grub-install.in
View file

@ -63,7 +63,7 @@ efi_quiet=
if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
disk_module=biosdisk disk_module=biosdisk
elif [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then elif [ "${platform}" = "ieee1275" ] || [ "${platform}" = "efi" ] ; then
disk_module= disk_module=
else else
disk_module=ata disk_module=ata
@ -445,7 +445,7 @@ esac
case "${target_cpu}-${platform}" in case "${target_cpu}-${platform}" in
i386-efi | x86_64-efi) imgext=efi ;; i386-efi | x86_64-efi) imgext=efi ;;
mips-yeeloong | i386-coreboot | i386-multiboot | i386-ieee1275 \ mips-yeeloong | i386-coreboot | i386-multiboot | i386-ieee1275 \
| powerpc-ieeee1275) imgext=elf ;; | powerpc-ieee1275) imgext=elf ;;
*) imgext=img ;; *) imgext=img ;;
esac esac
@ -456,7 +456,7 @@ $grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/core.${imge
if [ "${target_cpu}-${platform}" = "mips-yeeloong" ]; then if [ "${target_cpu}-${platform}" = "mips-yeeloong" ]; then
cp ${grubdir}/core.${imgext} /boot/grub.elf cp ${grubdir}/core.${imgext} /boot/grub.elf
elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platform}" = "powerpc-ieee1275" ]; then
cp ${grubdir}/core.${imgext} /boot/grub cp ${grubdir}/core.${imgext} /boot/grub/grub
elif [ "${target_cpu}-${platform}" = "i386-efi" ] || [ "${target_cpu}-${platform}" = "x86_64-efi" ]; then elif [ "${target_cpu}-${platform}" = "i386-efi" ] || [ "${target_cpu}-${platform}" = "x86_64-efi" ]; then
$grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/grub.efi --prefix="" $modules || exit 1 $grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/grub.efi --prefix="" $modules || exit 1
fi fi
@ -492,7 +492,7 @@ elif [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${pla
} }
# Point boot-device at the new grub install # Point boot-device at the new grub install
boot_device="$ofpath:$partno,"`grub-mkrelpath ${grubdir}/core.${imgext} | sed 's,/,\\,g'` boot_device="$ofpath:$partno,"`grub-mkrelpath ${grubdir}/core.${imgext} | sed 's,/,\\\\,g'`
"$nvsetenv" boot-device "$boot_device" || { "$nvsetenv" boot-device "$boot_device" || {
echo "$nvsetenv failed." echo "$nvsetenv failed."
echo "You will have to set boot-device manually. At the Open Firmware prompt, type:" echo "You will have to set boot-device manually. At the Open Firmware prompt, type:"