New commits:
commit 744c0bcbca65d7bdd8595e06a3beb6fdc193dc67
Author: George Sherwood <chat AT sourcemage.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>
grub: Added query for graphical boot screen. Bug 12852.(cherry picked
from commit 63cc8ceb40994de5ef7c545e3fda79258c2f4a6a)
+config_query GRUB_GRAPHICS "Enable graphical boot screen?" n
&&
config_query GRUB_EXT2 "Enable ext2 support in stage 2?" y
&&
config_query GRUB_FAT "Enable FAT16/32 support in stage 2?" y
&&
config_query GRUB_FFS "Enable FFS support in stage 2?" y
&&
diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY
index 61d1cf1..1a1c098 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,8 @@
+2007-03-15 George Sherwood <george AT beernabeer.com>
+ * CONFIGURE: Add query to use graphical boot screen. Bug #12852
+ * PRE_BUILD: Added if statement to check if user wants to
+ apply graphics patch
+
2006-12-20 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD, configure.ac.patch: added a patch to get rid of
automake-1.9, works with automake now
diff --git a/disk/grub/PRE_BUILD b/disk/grub/PRE_BUILD
index 0cb46e2..781eb69 100755
--- a/disk/grub/PRE_BUILD
+++ b/disk/grub/PRE_BUILD
@@ -7,9 +7,11 @@ patch -p1 < ${SCRIPT_DIRECTORY}/grub-
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-nxstack.patch &&
patch -p0 < ${SCRIPT_DIRECTORY}/configure.ac.patch &&
-if [ "$GRUB_REISER4" = "y" ]; then
+if [ "$GRUB_GRAPHICS" == "y" ]; then
+ if [ "$GRUB_REISER4" = "y" ]; then
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-reiser4-20050808.patch
&&
patch -p1 <
${SCRIPT_DIRECTORY}/grub-0.96-graphics-for-reiser4.patch
-else
+ else
patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.96-graphics.patch
+ fi
fi
[SM-Commit] GIT changes to stable-0.7 grimoire by Jeremy Blosser (744c0bcbca65d7bdd8595e06a3beb6fdc193dc67),
Jeremy Blosser, 03/15/2007