From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 11 Oct 2011 13:49:50 +0000 (+0200)
Subject: grub: Fix installation of default configuration.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2af18b566502d1346280c88cdabb960aa4fbf76d;p=ipfire-3.x.git

grub: Fix installation of default configuration.
---

diff --git a/grub/grub.default b/grub/default/grub
similarity index 100%
rename from grub/grub.default
rename to grub/default/grub
diff --git a/grub/grub.nm b/grub/grub.nm
index 4adffac60..409ce33e6 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,8 @@
 
 name       = grub
 version    = 1.99
-release    = 1
+release    = 2
+sup_arches = i686
 
 groups     = Base System/Boot
 url        = http://www.gnu.org/software/grub/
@@ -51,6 +52,9 @@ build
 		# Install splash background
 		mkdir -pv %{BUILDROOT}/boot/grub
 		install %{DIR_SOURCE}/splash.png %{BUILDROOT}/boot/grub
+
+		# Install empty configuration file.
+		touch %{BUILDROOT}/boot/grub/grub.cfg
 	end
 end
 
@@ -68,6 +72,11 @@ packages
 			/usr/share/X11/fonts/misc/unifont.pcf.gz
 		end
 
+		configfiles
+			/boot/grub/grub.cfg
+			/etc/default/grub
+		end
+
 		# Generate grub compatible font for graphical boot menu
 		# This only converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters
 		script postin