From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 May 2010 15:27:18 +0000 (+0200)
Subject: grub: Update some settings.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9799562f6ada698fea61cb9c8e415ed649687378;p=ipfire-3.x.git

grub: Update some settings.

Provide a file with default settings and add some
more configuration parameters.
---

diff --git a/pkgs/core/grub/grub.default b/pkgs/core/grub/grub.default
new file mode 100644
index 000000000..6200bd82f
--- /dev/null
+++ b/pkgs/core/grub/grub.default
@@ -0,0 +1,27 @@
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+
+GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=10
+GRUB_DISTRIBUTOR=$(sed 's/ release.*//' /etc/system-release)
+GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE=640x480
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+GRUB_DISABLE_LINUX_RECOVERY="true"
+
+# Uncomment to get a beep at grub start
+#GRUB_INIT_TUNE="480 440 1"
diff --git a/pkgs/core/grub/grub.nm b/pkgs/core/grub/grub.nm
index f49f71ae1..9a2761b7a 100644
--- a/pkgs/core/grub/grub.nm
+++ b/pkgs/core/grub/grub.nm
@@ -34,8 +34,8 @@ PKG_URL        = http://www.gnu.org/software/grub/
 PKG_LICENSE    = GPLv2+
 PKG_SUMMARY    = Grand Unified Boot Loader.
 
-PKG_BUILD_DEPS+= autoconf automake bison paxctl
-PKG_DEPS      += freetype ncurses
+PKG_BUILD_DEPS+= autoconf automake bison flex
+PKG_DEPS      += freetype ncurses zlib
 
 define PKG_DESCRIPTION
 	GRUB (Grand Unified Boot Loader) is an experimental boot loader \
@@ -51,7 +51,14 @@ QUALITY_AGENT_WHITELIST_NX = /usr/bin/*|/usr/sbin/*
 CFLAGS        += -fno-strict-aliasing
 
 CONFIGURE_OPTIONS += \
-	--sysconfdir=/etc
+	--sysconfdir=/etc \
+	--with-platform=pc \
+	--enable-grub-emu
+
+define STAGE_PREPARE_CMDS
+	cd $(DIR_APP) && \
+		sed -e "s@ GNU/Linux\"@\"@" -i util/grub.d/10_linux.in
+endef
 
 define STAGE_INSTALL
 	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)