[Frugalware-git] subzero: grub2-1.99-9-x86_64 * try to fix grub default config file on x86_64 * release bump

[James Buren]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=subzero.git;a=commitdiff;h=4cfdd1d32da85c0c2a9696808fd64d1b39412d12

commit 4cfdd1d32da85c0c2a9696808fd64d1b39412d12
Author: James Buren <ryuo at frugalware.org>
Date:   Sun Feb 26 12:05:57 2012 -0600

grub2-1.99-9-x86_64
* try to fix grub default config file on x86_64
* release bump

diff --git a/source/base/grub2/FrugalBuild b/source/base/grub2/FrugalBuild
index 307f721..3b56c39 100644
--- a/source/base/grub2/FrugalBuild
+++ b/source/base/grub2/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=grub2
_F_archive_name=grub
pkgver=1.99
-pkgrel=8
+pkgrel=9
pkgdesc="The GNU GRand Unified Bootloader"
url="http://www.gnu.org/software/grub/"
conflicts=('grub')
diff --git a/source/base/grub2/grub b/source/base/grub2/grub
index e943948..cc3a481 100644
--- a/source/base/grub2/grub
+++ b/source/base/grub2/grub
@@ -19,13 +19,12 @@ i686)
platform=pc
;;
x86_64)
-	efibootmgr &> /dev/null
-	if [ $? -ne 0 ]; then
-		target_cpu=i386
-		platform=pc
-	else
+	if [ -d '/sys/firmware/efi' -o -d '/proc/efi' ]; then
target_cpu=x86_64
platform=efi
-	fi
+	else
+		target_cpu=i386
+		platform=pc
+	fi
;;
-esac
+esac