Merge branch '2.8' into 3.0

grub2/.footprint

@@ -487,3 +487,4 @@ drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/grub/
 -rw-r--r--	root/root	usr/share/grub/grub-mkconfig_lib
+-rw-r--r--	root/root	usr/share/grub/unifont.pf2

grub2/.md5sum

@@ -1,2 +1,4 @@
 a1043102fbc7bcedbf53e7ee3d17ab91  grub-2.00.tar.xz
+8459e7425bf9eea9d482e53c5b5c91c9  grub.cfg.sample
 0d8c1aa18cbb52ac57c8414abb185e19  grub2-10_linux.diff
+6b8263ceccef33bd633aa019d74b7943  unifont-5.1.20080820.bdf.gz

grub2/Pkgfile

@@ -5,9 +5,10 @@
 
 name=grub2
 version=2.00
-release=2
+release=3
 source=(ftp://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \
-	$name-10_linux.diff)
+	http://unifoundry.com/unifont-5.1.20080820.bdf.gz \
+	$name-10_linux.diff grub.cfg.sample)
 
 build() {
 	export CFLAGS="${CFLAGS} -Wno-error"
@@ -23,4 +24,5 @@ build() {
 	make
 	make DESTDIR=$PKG install
 	rm -rf $PKG/usr/share/{info,locale,grub/themes}
+	./grub-mkfont -o $PKG/usr/share/grub/unifont.pf2
 }

grub2/README

@@ -0,0 +1,27 @@
+INSTALLATION
+
+	Once the grub2 port is installed, the boot loader itself can be installed
+	like so:
+
+	# grub-install /dev/<device>
+
+	For example, to install grub2 into the master boot record of the first
+	SCSI or SATA drive:
+
+	# grub-install /dev/sda
+
+	To install to the second partition of the first SCSI or SATA drive
+	instead of the MBR:
+
+	# grub-install /dev/sda2
+
+CONFIGURATION
+
+	A configuration menu file is required for grub2 to do more than display
+	a command line. It can be created automatically using the 'grub-mkconfig'
+	command like so:
+
+	# grub-mkconfig > /boot/grub/grub.cfg
+
+	It can also be created manually. A sample grub.cfg file is included in the
+	port.

grub2/grub.cfg.sample

@@ -0,0 +1,49 @@
+#
+# /boot/grub/grub.cfg - sample grub2 configuration file
+#
+
+# This is only a sample, you will need to check/edit the root value
+# or UUID used for your configuration.
+
+# See the official grub documentation for more information.
+
+# Set menu colors
+set menu_color_normal=white/blue
+set menu_color_highlight=light-blue/white
+
+# Set menu display time
+set timeout=10
+
+# Set the default boot entry (first is 0)
+set default=0
+
+# Set the root variable - grub2 uses this to find files if the
+# root device is not specified in the entry itself.
+# It can be set explicitly like so:
+
+#set root='(hd0,msdos2)'
+
+# Or it can be set using grub2's builtin search feature like so:
+
+#search --no-floppy --fs-uuid --set root xxxxxxxx-yyyy-zzzz-aaaa-bbbbbbbbbbbb
+
+# The string xxxxxxxx-yyyy-zzzz-aaaa-bbbbbbbbbbbb should be replaced with
+# the proper UUID for the root device. It can be found using 'blkid' from
+# util-linux.
+
+# Boot entries:
+
+# CRUX
+menuentry "CRUX 2.8 (3.6.3)" {
+	linux /boot/vmlinuz-3.6.3 root=/dev/sda2
+}
+
+menuentry "CRUX 2.8 (3.6.3) single-user rescue" {
+	linux /boot/vmlinuz-3.6.3 root=/dev/sda2 single
+}
+
+# Windows 7
+menuentry "Windows 7" {
+	set root='(hd0,msdos1)'
+	chainloader +1
+}