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

* util/grub-install.in: Fix an automatic target detection bug.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-18 23:01:51 +02:00
parent c6ca973d4b
commit 33d918b85f
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-04-18 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: Fix an automatic target detection bug.
2012-04-18 Vladimir Serbinenko <phcoder@gmail.com> 2012-04-18 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.in: New option --efi-directory. * util/grub-install.in: New option --efi-directory.

11
util/grub-install.in
View file

@ -294,8 +294,10 @@ if [ x$source_dir = x ]; then
esac esac
if [ -d /sys/firmware/efi ]; then if [ -d /sys/firmware/efi ]; then
target="x86_64-efi" target="x86_64-efi"
else
target=i386-pc
fi fi
target=i386-pc;; ;;
x"i"?"86"*) x"i"?"86"*)
# On Linux, we need the efivars kernel modules. # On Linux, we need the efivars kernel modules.
# If no EFI is available this module just does nothing # If no EFI is available this module just does nothing
@ -308,11 +310,12 @@ if [ x$source_dir = x ]; then
esac esac
if [ -d /sys/firmware/efi ]; then if [ -d /sys/firmware/efi ]; then
target="i386-efi" target="i386-efi"
fi elif [ -e /proc/device-tree ]; then
if [ -e /proc/device-tree ]; then
target="i386-ieee1275" target="i386-ieee1275"
else
target=i386-pc
fi fi
target=i386-pc;; ;;
*) *)
gettext "Unable to determine your platform. Use --target." ; gettext "Unable to determine your platform. Use --target." ;
echo ;; echo ;;