summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdisk/grub/CONFIGURE1
-rw-r--r--disk/grub/HISTORY5
-rwxr-xr-xdisk/grub/PRE_BUILD6
3 files changed, 10 insertions, 2 deletions
diff --git a/disk/grub/CONFIGURE b/disk/grub/CONFIGURE
index 4beef42cfa..2a69965432 100755
--- a/disk/grub/CONFIGURE
+++ b/disk/grub/CONFIGURE
@@ -50,6 +50,7 @@ kernel (hd0,0)/boot/vmlinubz-${UNAME_R} root=/dev/hda1 devfs=nomount
EOF
}
+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 61d1cf19fa..1a1c09874b 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,8 @@
+2007-03-15 George Sherwood <george@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@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 0cb46e24f3..781eb6999f 100755
--- a/disk/grub/PRE_BUILD
+++ b/disk/grub/PRE_BUILD
@@ -7,9 +7,11 @@ patch -p1 < ${SCRIPT_DIRECTORY}/grub-0.97-PIC.patch &&
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