From a4e462fda8b1f117405bfb49165466529dd0256c Mon Sep 17 00:00:00 2001
From: Matt Housh <jaeger@crux.nu>
Date: Thu, 30 Nov 2006 09:27:16 -0600
Subject: [PATCH] grub: menu.lst renamed to grub.conf, updated README and
 aesthetic fixups

---
 grub/.footprint       |  2 +-
 grub/.md5sum          |  2 +-
 grub/Pkgfile          |  6 ++--
 grub/README           |  9 +++---
 grub/grub.conf.sample | 64 +++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 grub/grub.conf.sample

diff --git a/grub/.footprint b/grub/.footprint
index 1a402133..b6da1099 100644
--- a/grub/.footprint
+++ b/grub/.footprint
@@ -2,7 +2,7 @@ drwxr-xr-x	root/root	boot/
 drwxr-xr-x	root/root	boot/grub/
 -rw-r--r--	root/root	boot/grub/crux02.xpm.gz
 -rw-r--r--	root/root	boot/grub/crux03.xpm.gz
--rw-r--r--	root/root	boot/grub/menu.lst.sample
+-rw-r--r--	root/root	boot/grub/grub.conf.sample
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/grub
 -rwxr-xr-x	root/root	sbin/grub-install
diff --git a/grub/.md5sum b/grub/.md5sum
index eb52e388..2d994f61 100644
--- a/grub/.md5sum
+++ b/grub/.md5sum
@@ -2,4 +2,4 @@
 55e343038043e16df5293d63782373d0  crux03.xpm.gz
 e0fce491c713805650df3d8962ead526  grub-0.97-patches.tar.gz
 cd3f3eb54446be6003156158d51f4884  grub-0.97.tar.gz
-1f2733522ab27183e3830d93733141ac  menu.lst.sample
+1f2733522ab27183e3830d93733141ac  grub.conf.sample
diff --git a/grub/Pkgfile b/grub/Pkgfile
index 07f9a4ca..297c3bb9 100644
--- a/grub/Pkgfile
+++ b/grub/Pkgfile
@@ -6,12 +6,12 @@
 
 name=grub
 version=0.97
-release=1
+release=2
 source=(ftp://alpha.gnu.org/gnu/grub/$name-$version.tar.gz \
 	http://crux.nu/files/grub/$version/$name-$version-patches.tar.gz \
 	http://crux.nu/files/grub/common/crux02.xpm.gz \
 	http://crux.nu/files/grub/common/crux03.xpm.gz \
-	menu.lst.sample)
+	grub.conf.sample)
 
 build () {
 	cd $name-$version
@@ -82,5 +82,5 @@ build () {
 	rm -rf $PKG/usr/share/info
 
 	mkdir -p $PKG/boot/grub
-	install -m 644 $SRC/{crux*,menu.lst.sample} $PKG/boot/grub/
+	install -m 644 $SRC/{crux*,grub.conf.sample} $PKG/boot/grub/
 }
diff --git a/grub/README b/grub/README
index 2027d2fb..411bd610 100644
--- a/grub/README
+++ b/grub/README
@@ -19,9 +19,9 @@ POST-INSTALL
 	Now it's time to create your own "boot menu":
 
 	# # Copy sample file
-	# cp /boot/grub/menu.lst.sample /boot/grub/menu.lst
+	# cp /boot/grub/grub.conf.sample /boot/grub/grub.conf
 	# # Modify it for your system 
-	# vi /boot/grub/menu.lst
+	# vi /boot/grub/grub.conf
 	
 	For more information about setting up your own grub boot menu file:
 	http://www.gnu.org/manual/grub-0.92/html_mono/grub.html#Configuration
@@ -43,9 +43,8 @@ POST-INSTALL
 PRECAUTION
 
 	Installing a new boot manager is like modifiying the partition table 
-	using fdisk - or installing a new system kernel. Please create a rescue
-	boot disk first :)
-	This is a heavy patched version of grub - Use it on your own risk !
+	or installing a new system kernel. Please create a rescue disk first :)
+	This is a heavily patched version of grub - Use it at your own risk !
 	
 Matt Housh	<jaeger@crux.nu>
 
diff --git a/grub/grub.conf.sample b/grub/grub.conf.sample
new file mode 100644
index 00000000..5a066abf
--- /dev/null
+++ b/grub/grub.conf.sample
@@ -0,0 +1,64 @@
+### Global settings
+
+## CRUX splash image
+splashimage (hd0,0)/boot/grub/crux03.xpm.gz
+## define special fore-/background colors for splash screen image
+foreground = FFFFFF
+background = AAAAAA
+
+## shaded text
+#shade 1
+
+## time to wait for user interaction
+timeout 5
+
+## default boot kernel 
+default 0
+
+### GRUB Devices:
+##
+## Linux         Grub
+## ======================
+## /dev/hda      (hd0)
+## /dev/hda1     (hd0,0)
+## /dev/hdb      (hd1)
+## /dev/hdb1     (hd1,0)
+## /dev/fd0      (fd0)
+
+### Remember:
+## The Linux kernel 2.4.19 has a bug which prevents using of devfs
+## device names (/dev/disc/disc0/part1,..). CRUX 0.9.4 comes with
+## 2.4.19 !
+
+## Default menu entries
+
+title CRUX
+kernel (hd0,0)/boot/vmlinuz root=/dev/hda1
+
+title CRUX
+kernel (hd0,0)/boot/vmlinuz.old root=/dev/hda1 
+
+### Special cases
+
+## Boot special bootimage
+#title Memtest
+#kernel (hd0,0)/boot/memtest.bin  
+
+## Boot Microsoft Windows(TM) 
+#title Windows 
+#root (hd0,5)
+#makeactive
+#chainloader +1
+
+## Boot from Floppy
+#title floppy
+#root (fd0)
+#chainloader +1
+
+## Boot with different /boot partition
+## /     = /dev/hdb2 = (hd1,1)
+## /boot = /dev/hdb1 = (hd1,0)
+##
+#title CRUX GNU/Linux drive 2
+#kernel (hd1,0)/vmlinuz root=/dev/hdb2 
+