Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (63cc8ceb40994de5ef7c545e3fda79258c2f4a6a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (63cc8ceb40994de5ef7c545e3fda79258c2f4a6a)
  • Date: Thu, 15 Mar 2007 10:42:03 -0500

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

disk/grub/CONFIGURE | 1 +
disk/grub/HISTORY | 5 +++++
disk/grub/PRE_BUILD | 6 ++++--
3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 63cc8ceb40994de5ef7c545e3fda79258c2f4a6a
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

grub: Added query for graphical boot screen. Bug 12852.

diff --git a/disk/grub/CONFIGURE b/disk/grub/CONFIGURE
index 4beef42..2a69965 100755
--- a/disk/grub/CONFIGURE
+++ b/disk/grub/CONFIGURE
@@ -50,6 +50,7 @@ kernel (hd0,0)/boot/vmlinubz-${UNAME_R}
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 1070c20..dc7a870 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
+
2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
* INSTALL: Replace bad TRACK_ROOT usage (automated).

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 master grimoire by George Sherwood (63cc8ceb40994de5ef7c545e3fda79258c2f4a6a), George Sherwood, 03/15/2007

Archive powered by MHonArc 2.6.24.

Top of Page