From: Michael Prokop <mika@grml.org>
Date: Thu, 11 Mar 2010 14:05:07 +0000 (+0100)
Subject: Update grub configuration.
X-Git-Tag: v0.9.39~1
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=e8e351d4a28c0788518c94890b550d6c05062a4e

Update grub configuration.

* Add scripts/create-grub-dir.sh to build templates/boot/grub/
* Add font file templates/boot/grub/ascii.pf2
* Update templates/boot/grub/ based on grub-pc_1.98-1_i386.deb
* grub.cfg:
  - add additional menu_color_* entries if loading background image
  - loadfont /boot/grub/ascii.pf2
  - increase timeout to 20 seconds
  - replace terminal command with terminal_output (sucking non-backward compability!)
  - use gfxpayload=1024x768 instead of vga=...
---

diff --git a/scripts/create-grub-dir.sh b/scripts/create-grub-dir.sh
new file mode 100755
index 0000000..0f3691c
--- /dev/null
+++ b/scripts/create-grub-dir.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+# Filename:      create-grub-dir.sh
+# Purpose:       generate core.img and according files for templates/boot/grub/
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+# Latest change: Thu Mar 11 14:25:15 CET 2010 [mika]
+################################################################################
+
+set -e
+
+if [ -z "$1" ] ; then
+  echo "Usage: $0 <grub_package.deb>">&2
+  echo "Usage example: $0 grub-pc_1.98-1_i386.deb">&2
+  exit 1
+fi
+
+if [ -d grub ] ; then
+  echo "Directory 'grub' exists in current working directory already, will not continue.">&2
+  exit 1
+fi
+
+GRUB="$1"
+oldpwd=$(pwd)
+
+if ! [ -f "$GRUB" ] ; then
+  wget http://ftp.de.debian.org/debian/pool/main/g/grub2/"$GRUB"
+fi
+
+if ! [ -f "$GRUB" ] ; then
+  echo "Error reading $GRUB - exiting.">&2
+  exit 1
+fi
+
+GRUBDIR=$(mktemp -d)
+cd "$GRUBDIR"
+
+mkdir -p grub
+
+ar x "${oldpwd}"/"$GRUB"
+tar xzf data.tar.gz
+./usr/bin/grub-mkimage -d usr/lib/grub/i386-pc -o core.img biosdisk iso9660
+
+for a in usr/lib/grub/i386-pc/{*.mod,efiemu??.o,command.lst,moddep.lst,fs.lst,handler.lst,parttool.lst}; do \
+  [[ -e $a ]] && cp $a grub/
+done
+
+mv core.img grub/
+
+cd "$oldpwd"
+mv "${GRUBDIR}"/grub .
+rm -rf "$GRUBDIR"
+
+echo "Generated new grub boot directory 'grub'."
+
+## END OF FILE #################################################################
diff --git a/templates/boot/grub/915resolution.mod b/templates/boot/grub/915resolution.mod
index 860af3d..a818a6f 100644
Binary files a/templates/boot/grub/915resolution.mod and b/templates/boot/grub/915resolution.mod differ
diff --git a/templates/boot/grub/acpi.mod b/templates/boot/grub/acpi.mod
index 5a90ce5..5448b56 100644
Binary files a/templates/boot/grub/acpi.mod and b/templates/boot/grub/acpi.mod differ
diff --git a/templates/boot/grub/affs.mod b/templates/boot/grub/affs.mod
index 9af38d0..b76ac00 100644
Binary files a/templates/boot/grub/affs.mod and b/templates/boot/grub/affs.mod differ
diff --git a/templates/boot/grub/afs.mod b/templates/boot/grub/afs.mod
index c973610..3a6ebeb 100644
Binary files a/templates/boot/grub/afs.mod and b/templates/boot/grub/afs.mod differ
diff --git a/templates/boot/grub/afs_be.mod b/templates/boot/grub/afs_be.mod
index aca9cc0..a02c3fc 100644
Binary files a/templates/boot/grub/afs_be.mod and b/templates/boot/grub/afs_be.mod differ
diff --git a/templates/boot/grub/ascii.pf2 b/templates/boot/grub/ascii.pf2
new file mode 100644
index 0000000..5b1c214
Binary files /dev/null and b/templates/boot/grub/ascii.pf2 differ
diff --git a/templates/boot/grub/at_keyboard.mod b/templates/boot/grub/at_keyboard.mod
index 6fcb492..69b08c5 100644
Binary files a/templates/boot/grub/at_keyboard.mod and b/templates/boot/grub/at_keyboard.mod differ
diff --git a/templates/boot/grub/ata.mod b/templates/boot/grub/ata.mod
index 7d1f42d..450ba09 100644
Binary files a/templates/boot/grub/ata.mod and b/templates/boot/grub/ata.mod differ
diff --git a/templates/boot/grub/ata_pthru.mod b/templates/boot/grub/ata_pthru.mod
index 7b51546..d4d5c36 100644
Binary files a/templates/boot/grub/ata_pthru.mod and b/templates/boot/grub/ata_pthru.mod differ
diff --git a/templates/boot/grub/befs.mod b/templates/boot/grub/befs.mod
index c3b7a53..2bcec10 100644
Binary files a/templates/boot/grub/befs.mod and b/templates/boot/grub/befs.mod differ
diff --git a/templates/boot/grub/befs_be.mod b/templates/boot/grub/befs_be.mod
index 78c8d76..9a3039a 100644
Binary files a/templates/boot/grub/befs_be.mod and b/templates/boot/grub/befs_be.mod differ
diff --git a/templates/boot/grub/biosdisk.mod b/templates/boot/grub/biosdisk.mod
index dd9cb24..3fee204 100644
Binary files a/templates/boot/grub/biosdisk.mod and b/templates/boot/grub/biosdisk.mod differ
diff --git a/templates/boot/grub/bitmap.mod b/templates/boot/grub/bitmap.mod
index 9c32a4f..fc26346 100644
Binary files a/templates/boot/grub/bitmap.mod and b/templates/boot/grub/bitmap.mod differ
diff --git a/templates/boot/grub/bitmap_scale.mod b/templates/boot/grub/bitmap_scale.mod
new file mode 100644
index 0000000..2d03fdf
Binary files /dev/null and b/templates/boot/grub/bitmap_scale.mod differ
diff --git a/templates/boot/grub/blocklist.mod b/templates/boot/grub/blocklist.mod
index a3eedcd..8a1f08d 100644
Binary files a/templates/boot/grub/blocklist.mod and b/templates/boot/grub/blocklist.mod differ
diff --git a/templates/boot/grub/boot.mod b/templates/boot/grub/boot.mod
index c3bfb9d..96b9413 100644
Binary files a/templates/boot/grub/boot.mod and b/templates/boot/grub/boot.mod differ
diff --git a/templates/boot/grub/bsd.mod b/templates/boot/grub/bsd.mod
index e9a1afc..990a837 100644
Binary files a/templates/boot/grub/bsd.mod and b/templates/boot/grub/bsd.mod differ
diff --git a/templates/boot/grub/cat.mod b/templates/boot/grub/cat.mod
index 9752e36..c32662f 100644
Binary files a/templates/boot/grub/cat.mod and b/templates/boot/grub/cat.mod differ
diff --git a/templates/boot/grub/chain.mod b/templates/boot/grub/chain.mod
index 206eef9..2628720 100644
Binary files a/templates/boot/grub/chain.mod and b/templates/boot/grub/chain.mod differ
diff --git a/templates/boot/grub/charset.mod b/templates/boot/grub/charset.mod
new file mode 100644
index 0000000..a329d58
Binary files /dev/null and b/templates/boot/grub/charset.mod differ
diff --git a/templates/boot/grub/cmp.mod b/templates/boot/grub/cmp.mod
index 83a8fe5..5ca45ad 100644
Binary files a/templates/boot/grub/cmp.mod and b/templates/boot/grub/cmp.mod differ
diff --git a/templates/boot/grub/command.lst b/templates/boot/grub/command.lst
index 2013d2a..bcb1381 100644
--- a/templates/boot/grub/command.lst
+++ b/templates/boot/grub/command.lst
@@ -1,37 +1,48 @@
 *915resolution: 915resolution
 *acpi: acpi
+*background_image: gfxterm
 *cat: cat
 *cpuid: cpuid
 *drivemap: drivemap
 *echo: echo
-*efiemu_pnvram: efiemu
-*freebsd: bsd
+*functional_test: functional_test
+*gettext: gettext
 *halt: halt
+*hashsum: hashsum
 *hdparm: hdparm
 *hello: hello
 *help: help
 *hexdump: hexdump
 *keystatus: keystatus
+*kfreebsd: bsd
+*knetbsd: bsd
+*kopenbsd: bsd
 *list_env: loadenv
 *load_env: loadenv
 *loopback: loopback
 *ls: ls
-*netbsd: bsd
-*openbsd: bsd
+*lspci: lspci
+*md5sum: hashsum
 *probe: probe
-*pxe: pxecmd
+*read_byte: memrw
+*read_dword: memrw
+*read_word: memrw
 *save_env: loadenv
 *search: search
 *serial: serial
+*setpci: setpci
+*sha256sum: hashsum
+*sha512sum: hashsum
 *sleep: sleep
+*xnu_splash: xnu
 .: configfile
 [: test
-background_image: gfxterm
 badram: mmap
 blocklist: blocklist
 boot: boot
 cat: minicmd
 chainloader: chain
+clear: minicmd
 cmp: cmp
 configfile: configfile
 crc: crc
@@ -41,37 +52,43 @@ efiemu_loadcore: efiemu
 efiemu_prepare: efiemu
 efiemu_unload: efiemu
 exit: minicmd
+export: normal
 false: true
-freebsd_loadenv: bsd
-freebsd_module: bsd
-freebsd_module_elf: bsd
 gptsync: gptsync
 handler: handler
 help: minicmd
 initrd16: linux16
 initrd: linux
+kfreebsd_loadenv: bsd
+kfreebsd_module: bsd
+kfreebsd_module_elf: bsd
 linux16: linux16
 linux: linux
 loadfont: font
 lsfonts: font
 lsmmap: lsmmap
 lsmod: minicmd
-lspci: lspci
 module: multiboot
+module: multiboot2
+multiboot2: multiboot2
 multiboot: multiboot
+normal: normal
+normal_exit: normal
 parttool: parttool
 password: password
+password_pbkdf2: password_pbkdf2
 play: play
+pxe_unload: pxecmd
 read: read
-read_byte: memrw
-read_dword: memrw
-read_word: memrw
 reboot: reboot
 rmmod: minicmd
 root: minicmd
+search.file: search_fs_file
+search.fs_label: search_label
+search.fs_uuid: search_fs_uuid
 source: configfile
-terminal_input: handler
-terminal_output: handler
+terminal_input: terminal
+terminal_output: terminal
 terminfo: terminfo
 test: test
 true: true
@@ -82,14 +99,14 @@ videotest: videotest
 write_byte: memrw
 write_dword: memrw
 write_word: memrw
-xnu_devtree: xnu
+xnu_devprop_load: xnu
+xnu_kernel64: xnu
 xnu_kernel: xnu
 xnu_kext: xnu
 xnu_kextdir: xnu
 xnu_mkext: xnu
 xnu_ramdisk: xnu
 xnu_resume: xnu
-xnu_splash: xnu
 xnu_uuid: xnu_uuid
 zfs-bootfs: zfsinfo
 zfsinfo: zfsinfo
diff --git a/templates/boot/grub/configfile.mod b/templates/boot/grub/configfile.mod
index 4a4626e..42a325d 100644
Binary files a/templates/boot/grub/configfile.mod and b/templates/boot/grub/configfile.mod differ
diff --git a/templates/boot/grub/core.img b/templates/boot/grub/core.img
index 4a29fb2..73a78df 100644
Binary files a/templates/boot/grub/core.img and b/templates/boot/grub/core.img differ
diff --git a/templates/boot/grub/cpio.mod b/templates/boot/grub/cpio.mod
index 5cd2471..17d0ae3 100644
Binary files a/templates/boot/grub/cpio.mod and b/templates/boot/grub/cpio.mod differ
diff --git a/templates/boot/grub/cpuid.mod b/templates/boot/grub/cpuid.mod
index 0aa6ac7..14ad6c9 100644
Binary files a/templates/boot/grub/cpuid.mod and b/templates/boot/grub/cpuid.mod differ
diff --git a/templates/boot/grub/crc.mod b/templates/boot/grub/crc.mod
index 61f28f6..d50d4e0 100644
Binary files a/templates/boot/grub/crc.mod and b/templates/boot/grub/crc.mod differ
diff --git a/templates/boot/grub/crypto.mod b/templates/boot/grub/crypto.mod
new file mode 100644
index 0000000..ad1b2e1
Binary files /dev/null and b/templates/boot/grub/crypto.mod differ
diff --git a/templates/boot/grub/date.mod b/templates/boot/grub/date.mod
index 2b88f8f..be38ba4 100644
Binary files a/templates/boot/grub/date.mod and b/templates/boot/grub/date.mod differ
diff --git a/templates/boot/grub/datehook.mod b/templates/boot/grub/datehook.mod
index 82518ae..0298ed4 100644
Binary files a/templates/boot/grub/datehook.mod and b/templates/boot/grub/datehook.mod differ
diff --git a/templates/boot/grub/dm_nv.mod b/templates/boot/grub/dm_nv.mod
index e1444b7..ae78f3e 100644
Binary files a/templates/boot/grub/dm_nv.mod and b/templates/boot/grub/dm_nv.mod differ
diff --git a/templates/boot/grub/drivemap.mod b/templates/boot/grub/drivemap.mod
index 9f3c004..e1de992 100644
Binary files a/templates/boot/grub/drivemap.mod and b/templates/boot/grub/drivemap.mod differ
diff --git a/templates/boot/grub/echo.mod b/templates/boot/grub/echo.mod
index d5e0e0c..79a1833 100644
Binary files a/templates/boot/grub/echo.mod and b/templates/boot/grub/echo.mod differ
diff --git a/templates/boot/grub/efiemu.mod b/templates/boot/grub/efiemu.mod
index 1741e39..dcf60e0 100644
Binary files a/templates/boot/grub/efiemu.mod and b/templates/boot/grub/efiemu.mod differ
diff --git a/templates/boot/grub/efiemu32.o b/templates/boot/grub/efiemu32.o
index 1645088..bef8c8d 100644
Binary files a/templates/boot/grub/efiemu32.o and b/templates/boot/grub/efiemu32.o differ
diff --git a/templates/boot/grub/efiemu64.o b/templates/boot/grub/efiemu64.o
index aa6a7cd..d4a30fe 100644
Binary files a/templates/boot/grub/efiemu64.o and b/templates/boot/grub/efiemu64.o differ
diff --git a/templates/boot/grub/elf.mod b/templates/boot/grub/elf.mod
index 2b62689..cd1bfcf 100644
Binary files a/templates/boot/grub/elf.mod and b/templates/boot/grub/elf.mod differ
diff --git a/templates/boot/grub/example_functional_test.mod b/templates/boot/grub/example_functional_test.mod
new file mode 100644
index 0000000..d30cb5b
Binary files /dev/null and b/templates/boot/grub/example_functional_test.mod differ
diff --git a/templates/boot/grub/ext2.mod b/templates/boot/grub/ext2.mod
index f8949e2..ad7328e 100644
Binary files a/templates/boot/grub/ext2.mod and b/templates/boot/grub/ext2.mod differ
diff --git a/templates/boot/grub/extcmd.mod b/templates/boot/grub/extcmd.mod
index 994fecc..d2a4570 100644
Binary files a/templates/boot/grub/extcmd.mod and b/templates/boot/grub/extcmd.mod differ
diff --git a/templates/boot/grub/fat.mod b/templates/boot/grub/fat.mod
index 7f26467..a2262c0 100644
Binary files a/templates/boot/grub/fat.mod and b/templates/boot/grub/fat.mod differ
diff --git a/templates/boot/grub/font.mod b/templates/boot/grub/font.mod
index 2974462..36821e0 100644
Binary files a/templates/boot/grub/font.mod and b/templates/boot/grub/font.mod differ
diff --git a/templates/boot/grub/functional_test.mod b/templates/boot/grub/functional_test.mod
new file mode 100644
index 0000000..9febe5b
Binary files /dev/null and b/templates/boot/grub/functional_test.mod differ
diff --git a/templates/boot/grub/gcry_arcfour.mod b/templates/boot/grub/gcry_arcfour.mod
new file mode 100644
index 0000000..ec40ae4
Binary files /dev/null and b/templates/boot/grub/gcry_arcfour.mod differ
diff --git a/templates/boot/grub/gcry_blowfish.mod b/templates/boot/grub/gcry_blowfish.mod
new file mode 100644
index 0000000..50ebdf4
Binary files /dev/null and b/templates/boot/grub/gcry_blowfish.mod differ
diff --git a/templates/boot/grub/gcry_camellia.mod b/templates/boot/grub/gcry_camellia.mod
new file mode 100644
index 0000000..3e1f202
Binary files /dev/null and b/templates/boot/grub/gcry_camellia.mod differ
diff --git a/templates/boot/grub/gcry_cast5.mod b/templates/boot/grub/gcry_cast5.mod
new file mode 100644
index 0000000..a747f23
Binary files /dev/null and b/templates/boot/grub/gcry_cast5.mod differ
diff --git a/templates/boot/grub/gcry_crc.mod b/templates/boot/grub/gcry_crc.mod
new file mode 100644
index 0000000..d360e25
Binary files /dev/null and b/templates/boot/grub/gcry_crc.mod differ
diff --git a/templates/boot/grub/gcry_des.mod b/templates/boot/grub/gcry_des.mod
new file mode 100644
index 0000000..168beff
Binary files /dev/null and b/templates/boot/grub/gcry_des.mod differ
diff --git a/templates/boot/grub/gcry_md4.mod b/templates/boot/grub/gcry_md4.mod
new file mode 100644
index 0000000..78f9fba
Binary files /dev/null and b/templates/boot/grub/gcry_md4.mod differ
diff --git a/templates/boot/grub/gcry_md5.mod b/templates/boot/grub/gcry_md5.mod
new file mode 100644
index 0000000..8773b44
Binary files /dev/null and b/templates/boot/grub/gcry_md5.mod differ
diff --git a/templates/boot/grub/gcry_rfc2268.mod b/templates/boot/grub/gcry_rfc2268.mod
new file mode 100644
index 0000000..7195fbf
Binary files /dev/null and b/templates/boot/grub/gcry_rfc2268.mod differ
diff --git a/templates/boot/grub/gcry_rijndael.mod b/templates/boot/grub/gcry_rijndael.mod
new file mode 100644
index 0000000..cf3b6ea
Binary files /dev/null and b/templates/boot/grub/gcry_rijndael.mod differ
diff --git a/templates/boot/grub/gcry_rmd160.mod b/templates/boot/grub/gcry_rmd160.mod
new file mode 100644
index 0000000..0c74219
Binary files /dev/null and b/templates/boot/grub/gcry_rmd160.mod differ
diff --git a/templates/boot/grub/gcry_seed.mod b/templates/boot/grub/gcry_seed.mod
new file mode 100644
index 0000000..693df7d
Binary files /dev/null and b/templates/boot/grub/gcry_seed.mod differ
diff --git a/templates/boot/grub/gcry_serpent.mod b/templates/boot/grub/gcry_serpent.mod
new file mode 100644
index 0000000..5471136
Binary files /dev/null and b/templates/boot/grub/gcry_serpent.mod differ
diff --git a/templates/boot/grub/gcry_sha1.mod b/templates/boot/grub/gcry_sha1.mod
new file mode 100644
index 0000000..ff89806
Binary files /dev/null and b/templates/boot/grub/gcry_sha1.mod differ
diff --git a/templates/boot/grub/gcry_sha256.mod b/templates/boot/grub/gcry_sha256.mod
new file mode 100644
index 0000000..17e59fb
Binary files /dev/null and b/templates/boot/grub/gcry_sha256.mod differ
diff --git a/templates/boot/grub/gcry_sha512.mod b/templates/boot/grub/gcry_sha512.mod
new file mode 100644
index 0000000..b123433
Binary files /dev/null and b/templates/boot/grub/gcry_sha512.mod differ
diff --git a/templates/boot/grub/gcry_tiger.mod b/templates/boot/grub/gcry_tiger.mod
new file mode 100644
index 0000000..bdc683c
Binary files /dev/null and b/templates/boot/grub/gcry_tiger.mod differ
diff --git a/templates/boot/grub/gcry_twofish.mod b/templates/boot/grub/gcry_twofish.mod
new file mode 100644
index 0000000..5b55e36
Binary files /dev/null and b/templates/boot/grub/gcry_twofish.mod differ
diff --git a/templates/boot/grub/gcry_whirlpool.mod b/templates/boot/grub/gcry_whirlpool.mod
new file mode 100644
index 0000000..219490b
Binary files /dev/null and b/templates/boot/grub/gcry_whirlpool.mod differ
diff --git a/templates/boot/grub/gettext.mod b/templates/boot/grub/gettext.mod
new file mode 100644
index 0000000..17f6d50
Binary files /dev/null and b/templates/boot/grub/gettext.mod differ
diff --git a/templates/boot/grub/gfxmenu.mod b/templates/boot/grub/gfxmenu.mod
new file mode 100644
index 0000000..449e97b
Binary files /dev/null and b/templates/boot/grub/gfxmenu.mod differ
diff --git a/templates/boot/grub/gfxterm.mod b/templates/boot/grub/gfxterm.mod
index 4b527b3..5bf07f1 100644
Binary files a/templates/boot/grub/gfxterm.mod and b/templates/boot/grub/gfxterm.mod differ
diff --git a/templates/boot/grub/gptsync.mod b/templates/boot/grub/gptsync.mod
index 868f65c..2bd0505 100644
Binary files a/templates/boot/grub/gptsync.mod and b/templates/boot/grub/gptsync.mod differ
diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 2f3dc4c..fde7a39 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -1,25 +1,28 @@
 ## grub2 configuration
 set default=0
-set timeout=5
+set timeout=20
 
-if font (hd0,1)/boot/grub/ascii.pff ; then
+if loadfont /boot/grub/ascii.pf2 ; then
    insmod png
    set gfxmode=640x480
    insmod gfxterm
    insmod vbe
-   terminal gfxterm
+   terminal_output gfxterm
 fi
 
-if background_image (hd0,1)/boot/grub/grml.png ; then
+if background_image /boot/grub/grml.png ; then
   set color_normal=black/black
   set color_highlight=red/black
+  set menu_color_normal=black/black
+  set menu_color_highlight=black/yellow
 else
   set menu_color_normal=white/black
   set menu_color_highlight=black/yellow
 fi
 
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
-    linux   /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce 
+    set gfxpayload=1024x768
+    linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% nomce 
     initrd  /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -64,22 +67,26 @@ menuentry "Boot OS of first partition on first disk" {
 }
 
 menuentry "%GRML_NAME% - enable persistent mode" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet persistent 
+    set gfxpayload=1024x768x16,1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet persistent 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
-menuentry "%GRML_NAME% - copy grml to RAM" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet toram=%GRML_NAME%.squashfs 
+menuentry "%GRML_NAME% - copy Grml to RAM" {
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet toram=%GRML_NAME%.squashfs 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet toram
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet toram
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 quiet startx=wm-ng 
+    set gfxpayload=1024x768
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce quiet startx=wm-ng 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -89,7 +96,8 @@ menuentry "%GRML_NAME% - disable framebuffer" {
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
+    set gfxpayload=1024x768
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -99,7 +107,8 @@ menuentry "%GRML_NAME% - failsafe mode" {
 }
 
 menuentry "%GRML_NAME% - debug mode" {
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce vga=791 initcall verbose debug=vc
+    set gfxpayload=1024x768
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce initcall verbose debug=vc
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
diff --git a/templates/boot/grub/gzio.mod b/templates/boot/grub/gzio.mod
index 7663644..babfbe4 100644
Binary files a/templates/boot/grub/gzio.mod and b/templates/boot/grub/gzio.mod differ
diff --git a/templates/boot/grub/halt.mod b/templates/boot/grub/halt.mod
index 33c8681..41c8e0f 100644
Binary files a/templates/boot/grub/halt.mod and b/templates/boot/grub/halt.mod differ
diff --git a/templates/boot/grub/handler.lst b/templates/boot/grub/handler.lst
index 9ced05f..90212c4 100644
--- a/templates/boot/grub/handler.lst
+++ b/templates/boot/grub/handler.lst
@@ -1,9 +1 @@
-parser.sh: sh
-reader.normal: normal
-terminal_input.at_keyboard: at_keyboard
-terminal_input.serial: serial
-terminal_input.usb_keyboard: usb_keyboard
-terminal_output.gfxterm: gfxterm
-terminal_output.serial: serial
-terminal_output.vga: vga
-terminal_output.vga_text: vga_text
+parser.grub: sh
diff --git a/templates/boot/grub/handler.mod b/templates/boot/grub/handler.mod
index 0b718b7..5e7d4f1 100644
Binary files a/templates/boot/grub/handler.mod and b/templates/boot/grub/handler.mod differ
diff --git a/templates/boot/grub/hashsum.mod b/templates/boot/grub/hashsum.mod
new file mode 100644
index 0000000..4d3c7ba
Binary files /dev/null and b/templates/boot/grub/hashsum.mod differ
diff --git a/templates/boot/grub/hdparm.mod b/templates/boot/grub/hdparm.mod
index dc7d825..e7d57cb 100644
Binary files a/templates/boot/grub/hdparm.mod and b/templates/boot/grub/hdparm.mod differ
diff --git a/templates/boot/grub/hello.mod b/templates/boot/grub/hello.mod
index 3a42b9c..74c8ca6 100644
Binary files a/templates/boot/grub/hello.mod and b/templates/boot/grub/hello.mod differ
diff --git a/templates/boot/grub/help.mod b/templates/boot/grub/help.mod
index e8dafd2..b5d193b 100644
Binary files a/templates/boot/grub/help.mod and b/templates/boot/grub/help.mod differ
diff --git a/templates/boot/grub/hexdump.mod b/templates/boot/grub/hexdump.mod
index 5fa1cd5..4283247 100644
Binary files a/templates/boot/grub/hexdump.mod and b/templates/boot/grub/hexdump.mod differ
diff --git a/templates/boot/grub/hfs.mod b/templates/boot/grub/hfs.mod
index 9828773..5e4781f 100644
Binary files a/templates/boot/grub/hfs.mod and b/templates/boot/grub/hfs.mod differ
diff --git a/templates/boot/grub/hfsplus.mod b/templates/boot/grub/hfsplus.mod
index e74a4d1..2b7c35c 100644
Binary files a/templates/boot/grub/hfsplus.mod and b/templates/boot/grub/hfsplus.mod differ
diff --git a/templates/boot/grub/iso9660.mod b/templates/boot/grub/iso9660.mod
index f182a26..3b71a2c 100644
Binary files a/templates/boot/grub/iso9660.mod and b/templates/boot/grub/iso9660.mod differ
diff --git a/templates/boot/grub/jfs.mod b/templates/boot/grub/jfs.mod
index 2a5a637..16c389e 100644
Binary files a/templates/boot/grub/jfs.mod and b/templates/boot/grub/jfs.mod differ
diff --git a/templates/boot/grub/keystatus.mod b/templates/boot/grub/keystatus.mod
index c60af0e..ad48299 100644
Binary files a/templates/boot/grub/keystatus.mod and b/templates/boot/grub/keystatus.mod differ
diff --git a/templates/boot/grub/linux.mod b/templates/boot/grub/linux.mod
index 079cddf..b9a9c6d 100644
Binary files a/templates/boot/grub/linux.mod and b/templates/boot/grub/linux.mod differ
diff --git a/templates/boot/grub/linux16.mod b/templates/boot/grub/linux16.mod
index ba47ab2..951dc52 100644
Binary files a/templates/boot/grub/linux16.mod and b/templates/boot/grub/linux16.mod differ
diff --git a/templates/boot/grub/loadenv.mod b/templates/boot/grub/loadenv.mod
index ddbaa3d..5a380d3 100644
Binary files a/templates/boot/grub/loadenv.mod and b/templates/boot/grub/loadenv.mod differ
diff --git a/templates/boot/grub/loopback.mod b/templates/boot/grub/loopback.mod
index 9a2c621..425a3f3 100644
Binary files a/templates/boot/grub/loopback.mod and b/templates/boot/grub/loopback.mod differ
diff --git a/templates/boot/grub/ls.mod b/templates/boot/grub/ls.mod
index 8e551cc..0e47665 100644
Binary files a/templates/boot/grub/ls.mod and b/templates/boot/grub/ls.mod differ
diff --git a/templates/boot/grub/lspci.mod b/templates/boot/grub/lspci.mod
index b8c29a7..f60e841 100644
Binary files a/templates/boot/grub/lspci.mod and b/templates/boot/grub/lspci.mod differ
diff --git a/templates/boot/grub/lvm.mod b/templates/boot/grub/lvm.mod
index 7e0e71e..f049e1c 100644
Binary files a/templates/boot/grub/lvm.mod and b/templates/boot/grub/lvm.mod differ
diff --git a/templates/boot/grub/mdraid.mod b/templates/boot/grub/mdraid.mod
index 45e19d7..a69a039 100644
Binary files a/templates/boot/grub/mdraid.mod and b/templates/boot/grub/mdraid.mod differ
diff --git a/templates/boot/grub/memdisk.mod b/templates/boot/grub/memdisk.mod
index 9882f85..457969a 100644
Binary files a/templates/boot/grub/memdisk.mod and b/templates/boot/grub/memdisk.mod differ
diff --git a/templates/boot/grub/memrw.mod b/templates/boot/grub/memrw.mod
index c6d559b..bd221a9 100644
Binary files a/templates/boot/grub/memrw.mod and b/templates/boot/grub/memrw.mod differ
diff --git a/templates/boot/grub/minicmd.mod b/templates/boot/grub/minicmd.mod
index e1b1f49..84c767b 100644
Binary files a/templates/boot/grub/minicmd.mod and b/templates/boot/grub/minicmd.mod differ
diff --git a/templates/boot/grub/minix.mod b/templates/boot/grub/minix.mod
index a07008a..47f4f9d 100644
Binary files a/templates/boot/grub/minix.mod and b/templates/boot/grub/minix.mod differ
diff --git a/templates/boot/grub/mmap.mod b/templates/boot/grub/mmap.mod
index c1ec6b7..d66db82 100644
Binary files a/templates/boot/grub/mmap.mod and b/templates/boot/grub/mmap.mod differ
diff --git a/templates/boot/grub/moddep.lst b/templates/boot/grub/moddep.lst
index 5f3daae..a8e741c 100644
--- a/templates/boot/grub/moddep.lst
+++ b/templates/boot/grub/moddep.lst
@@ -1,38 +1,49 @@
+gcry_des: crypto
 videotest: font video
 loopback: extcmd
-memrw:
+memrw: extcmd
 terminfo:
 part_gpt:
+gcry_arcfour: crypto
 read:
 aout:
 elf: gzio
 vga_text:
-bsd: elf extcmd aout boot gzio mmap
+gcry_seed: crypto
+password_pbkdf2: crypto gcry_sha512 pbkdf2 normal
+bsd: elf extcmd aout boot video cpuid gzio mmap
 reiserfs: fshelp
 sfs: fshelp
 915resolution: extcmd
+gfxmenu: trig bitmap_scale gfxterm font normal bitmap video
 configfile: normal
-help: extcmd
+help: charset extcmd normal
 jfs:
 afs: fshelp
 ohci: usb pci
+search_fs_file:
 usb_keyboard: usb
 vga: font
 usbms: scsi usb
 true:
 affs: fshelp
 iso9660: fshelp
-gfxterm: font bitmap video
+gfxterm: bitmap_scale font extcmd bitmap video
+functional_test: extcmd
 xfs: fshelp
-sleep: extcmd
+sleep: extcmd normal
 vbetest: vbe video
-pxecmd: pxe extcmd
+pxecmd: pxe
 memdisk:
-fs_file:
+gcry_rijndael: crypto
+gcry_sha1: crypto
+gettext: normal gzio
 cmp: gzio
 befs_be: fshelp
+hashsum: crypto extcmd normal
 halt: extcmd
 usb:
+search_fs_uuid:
 keystatus: extcmd
 linux: normal boot video mmap
 part_sun:
@@ -40,40 +51,47 @@ mdraid: raid
 bufio:
 handler:
 cpuid: extcmd
+gcry_blowfish: crypto
 hdparm: extcmd
 test:
 minicmd:
 ata: scsi pci
 gzio:
 udf: fshelp
-xnu_uuid:
+terminal:
+xnu_uuid: gcry_md5
 uhci: usb pci
+crypto:
 raid:
+gcry_sha512: crypto
 biosdisk:
-password: normal
+password: crypto normal
 fshelp:
-efiemu: crc extcmd acpi
+efiemu: charset crc acpi
 mmap: boot
-xnu: boot video bitmap efiemu gzio
+xnu: bitmap_scale charset extcmd boot bitmap video relocator efiemu gzio
 zfsinfo: zfs
 blocklist:
 ext2: fshelp
 drivemap: extcmd boot mmap
 part_acorn:
-fs_uuid:
 sh: normal
 lsmmap:
 bitmap:
 ntfs: fshelp
-multiboot: elf boot gzio mmap
+multiboot: boot video relocator gzio mmap
 vbe: video video_fb
+gcry_crc: crypto
 png: bufio bitmap
 jpeg: bufio bitmap
 parttool: normal
 cpio:
+gcry_rmd160: crypto
 fat:
+charset:
 zfs:
 raid6rec: raid
+bitmap_scale: bitmap
 loadenv: extcmd
 datehook: datetime normal
 probe: extcmd
@@ -81,6 +99,7 @@ tar:
 hfs:
 boot:
 vbeinfo: vbe
+relocator:
 acpi: extcmd gzio mmap
 usbtest: usb
 tga: bufio bitmap
@@ -90,35 +109,50 @@ serial: extcmd terminfo
 dm_nv: raid
 font: bufio video
 raid5rec: raid
+example_functional_test: functional_test
 video:
 crc:
+gcry_cast5: crypto
 hfsplus: fshelp
 extcmd:
+gcry_whirlpool: crypto
+gcry_tiger: crypto
 pxe: bufio
 video_fb: video
-search: extcmd
-lspci: pci
+search: search_fs_uuid search_fs_file extcmd search_label
+lspci: extcmd pci
 afs_be: fshelp
+gcry_twofish: crypto
 msdospart: parttool
 hexdump: extcmd gzio
 part_apple:
 ata_pthru: ata
+gcry_sha256: crypto
+pbkdf2: crypto
 date: datetime normal
 ls: extcmd normal
 ntfscomp: ntfs
 hello: extcmd
 scsi:
-normal: boot
+normal: terminal crypto charset boot
 cat: gzio
-linux16: boot mmap
+linux16: video boot mmap
 lvm:
 ufs1:
-chain: boot
+chain: video boot
+search_label:
 gptsync:
 ufs2:
+setpci: extcmd pci
+gcry_rfc2268: crypto
+multiboot2: boot video relocator gzio mmap
 part_amiga:
 play:
 echo: extcmd
 minix:
+gcry_serpent: crypto
+gcry_md4: crypto
+gcry_md5: crypto
+gcry_camellia: crypto
 part_msdos:
 at_keyboard:
diff --git a/templates/boot/grub/multiboot.mod b/templates/boot/grub/multiboot.mod
index fe04559..8d741bf 100644
Binary files a/templates/boot/grub/multiboot.mod and b/templates/boot/grub/multiboot.mod differ
diff --git a/templates/boot/grub/multiboot2.mod b/templates/boot/grub/multiboot2.mod
new file mode 100644
index 0000000..5380aa9
Binary files /dev/null and b/templates/boot/grub/multiboot2.mod differ
diff --git a/templates/boot/grub/normal.mod b/templates/boot/grub/normal.mod
index b1003b5..d1888e3 100644
Binary files a/templates/boot/grub/normal.mod and b/templates/boot/grub/normal.mod differ
diff --git a/templates/boot/grub/ntfs.mod b/templates/boot/grub/ntfs.mod
index 057bb4d..3dd6227 100644
Binary files a/templates/boot/grub/ntfs.mod and b/templates/boot/grub/ntfs.mod differ
diff --git a/templates/boot/grub/ntfscomp.mod b/templates/boot/grub/ntfscomp.mod
index 72f2656..ffccd83 100644
Binary files a/templates/boot/grub/ntfscomp.mod and b/templates/boot/grub/ntfscomp.mod differ
diff --git a/templates/boot/grub/ohci.mod b/templates/boot/grub/ohci.mod
index e238a62..1d42ede 100644
Binary files a/templates/boot/grub/ohci.mod and b/templates/boot/grub/ohci.mod differ
diff --git a/templates/boot/grub/part_acorn.mod b/templates/boot/grub/part_acorn.mod
index 33531a6..5ea7883 100644
Binary files a/templates/boot/grub/part_acorn.mod and b/templates/boot/grub/part_acorn.mod differ
diff --git a/templates/boot/grub/part_amiga.mod b/templates/boot/grub/part_amiga.mod
index 2979050..b855df2 100644
Binary files a/templates/boot/grub/part_amiga.mod and b/templates/boot/grub/part_amiga.mod differ
diff --git a/templates/boot/grub/part_apple.mod b/templates/boot/grub/part_apple.mod
index e8e848b..2957adb 100644
Binary files a/templates/boot/grub/part_apple.mod and b/templates/boot/grub/part_apple.mod differ
diff --git a/templates/boot/grub/part_gpt.mod b/templates/boot/grub/part_gpt.mod
index 8601208..3749229 100644
Binary files a/templates/boot/grub/part_gpt.mod and b/templates/boot/grub/part_gpt.mod differ
diff --git a/templates/boot/grub/part_msdos.mod b/templates/boot/grub/part_msdos.mod
index 87648e0..3d05ae5 100644
Binary files a/templates/boot/grub/part_msdos.mod and b/templates/boot/grub/part_msdos.mod differ
diff --git a/templates/boot/grub/part_sun.mod b/templates/boot/grub/part_sun.mod
index 9b342ee..3d12454 100644
Binary files a/templates/boot/grub/part_sun.mod and b/templates/boot/grub/part_sun.mod differ
diff --git a/templates/boot/grub/parttool.mod b/templates/boot/grub/parttool.mod
index ae5e813..6527bd2 100644
Binary files a/templates/boot/grub/parttool.mod and b/templates/boot/grub/parttool.mod differ
diff --git a/templates/boot/grub/password.mod b/templates/boot/grub/password.mod
index ec63f87..deb790a 100644
Binary files a/templates/boot/grub/password.mod and b/templates/boot/grub/password.mod differ
diff --git a/templates/boot/grub/password_pbkdf2.mod b/templates/boot/grub/password_pbkdf2.mod
new file mode 100644
index 0000000..1f24939
Binary files /dev/null and b/templates/boot/grub/password_pbkdf2.mod differ
diff --git a/templates/boot/grub/pbkdf2.mod b/templates/boot/grub/pbkdf2.mod
new file mode 100644
index 0000000..d4845ea
Binary files /dev/null and b/templates/boot/grub/pbkdf2.mod differ
diff --git a/templates/boot/grub/pci.mod b/templates/boot/grub/pci.mod
index 1a63d1e..358abc4 100644
Binary files a/templates/boot/grub/pci.mod and b/templates/boot/grub/pci.mod differ
diff --git a/templates/boot/grub/play.mod b/templates/boot/grub/play.mod
index 3cef950..de2c7ad 100644
Binary files a/templates/boot/grub/play.mod and b/templates/boot/grub/play.mod differ
diff --git a/templates/boot/grub/png.mod b/templates/boot/grub/png.mod
index c38a211..9f20e41 100644
Binary files a/templates/boot/grub/png.mod and b/templates/boot/grub/png.mod differ
diff --git a/templates/boot/grub/probe.mod b/templates/boot/grub/probe.mod
index b1d174c..8580a69 100644
Binary files a/templates/boot/grub/probe.mod and b/templates/boot/grub/probe.mod differ
diff --git a/templates/boot/grub/pxe.mod b/templates/boot/grub/pxe.mod
index 0500fbd..3d12543 100644
Binary files a/templates/boot/grub/pxe.mod and b/templates/boot/grub/pxe.mod differ
diff --git a/templates/boot/grub/pxecmd.mod b/templates/boot/grub/pxecmd.mod
index d59fcdb..98e7279 100644
Binary files a/templates/boot/grub/pxecmd.mod and b/templates/boot/grub/pxecmd.mod differ
diff --git a/templates/boot/grub/raid.mod b/templates/boot/grub/raid.mod
index 0498b9b..8ef915f 100644
Binary files a/templates/boot/grub/raid.mod and b/templates/boot/grub/raid.mod differ
diff --git a/templates/boot/grub/raid6rec.mod b/templates/boot/grub/raid6rec.mod
index 83f75a6..c0e395f 100644
Binary files a/templates/boot/grub/raid6rec.mod and b/templates/boot/grub/raid6rec.mod differ
diff --git a/templates/boot/grub/read.mod b/templates/boot/grub/read.mod
index 8955d40..bb7fb8b 100644
Binary files a/templates/boot/grub/read.mod and b/templates/boot/grub/read.mod differ
diff --git a/templates/boot/grub/reboot.mod b/templates/boot/grub/reboot.mod
index 2882d55..b86bd98 100644
Binary files a/templates/boot/grub/reboot.mod and b/templates/boot/grub/reboot.mod differ
diff --git a/templates/boot/grub/reiserfs.mod b/templates/boot/grub/reiserfs.mod
index 9e19754..2bebea9 100644
Binary files a/templates/boot/grub/reiserfs.mod and b/templates/boot/grub/reiserfs.mod differ
diff --git a/templates/boot/grub/relocator.mod b/templates/boot/grub/relocator.mod
new file mode 100644
index 0000000..43b895f
Binary files /dev/null and b/templates/boot/grub/relocator.mod differ
diff --git a/templates/boot/grub/scsi.mod b/templates/boot/grub/scsi.mod
index ca5c3da..ca5b30f 100644
Binary files a/templates/boot/grub/scsi.mod and b/templates/boot/grub/scsi.mod differ
diff --git a/templates/boot/grub/search.mod b/templates/boot/grub/search.mod
index d429138..ca27937 100644
Binary files a/templates/boot/grub/search.mod and b/templates/boot/grub/search.mod differ
diff --git a/templates/boot/grub/search_fs_file.mod b/templates/boot/grub/search_fs_file.mod
new file mode 100644
index 0000000..4ec173c
Binary files /dev/null and b/templates/boot/grub/search_fs_file.mod differ
diff --git a/templates/boot/grub/search_fs_uuid.mod b/templates/boot/grub/search_fs_uuid.mod
new file mode 100644
index 0000000..57bf81e
Binary files /dev/null and b/templates/boot/grub/search_fs_uuid.mod differ
diff --git a/templates/boot/grub/search_label.mod b/templates/boot/grub/search_label.mod
new file mode 100644
index 0000000..4250f9c
Binary files /dev/null and b/templates/boot/grub/search_label.mod differ
diff --git a/templates/boot/grub/serial.mod b/templates/boot/grub/serial.mod
index f6308e2..2ac35e3 100644
Binary files a/templates/boot/grub/serial.mod and b/templates/boot/grub/serial.mod differ
diff --git a/templates/boot/grub/setpci.mod b/templates/boot/grub/setpci.mod
new file mode 100644
index 0000000..c58e01b
Binary files /dev/null and b/templates/boot/grub/setpci.mod differ
diff --git a/templates/boot/grub/sfs.mod b/templates/boot/grub/sfs.mod
index 3c763c4..ff7b56a 100644
Binary files a/templates/boot/grub/sfs.mod and b/templates/boot/grub/sfs.mod differ
diff --git a/templates/boot/grub/sh.mod b/templates/boot/grub/sh.mod
index c50d3c4..469d31b 100644
Binary files a/templates/boot/grub/sh.mod and b/templates/boot/grub/sh.mod differ
diff --git a/templates/boot/grub/sleep.mod b/templates/boot/grub/sleep.mod
index c77a125..921d50e 100644
Binary files a/templates/boot/grub/sleep.mod and b/templates/boot/grub/sleep.mod differ
diff --git a/templates/boot/grub/tar.mod b/templates/boot/grub/tar.mod
index 44c8e43..dc8e950 100644
Binary files a/templates/boot/grub/tar.mod and b/templates/boot/grub/tar.mod differ
diff --git a/templates/boot/grub/terminal.mod b/templates/boot/grub/terminal.mod
new file mode 100644
index 0000000..da1dd50
Binary files /dev/null and b/templates/boot/grub/terminal.mod differ
diff --git a/templates/boot/grub/terminfo.mod b/templates/boot/grub/terminfo.mod
index 12175b1..5e02c69 100644
Binary files a/templates/boot/grub/terminfo.mod and b/templates/boot/grub/terminfo.mod differ
diff --git a/templates/boot/grub/test.mod b/templates/boot/grub/test.mod
index 6e3632e..1f37b97 100644
Binary files a/templates/boot/grub/test.mod and b/templates/boot/grub/test.mod differ
diff --git a/templates/boot/grub/tga.mod b/templates/boot/grub/tga.mod
index 8d37b8c..fb6e53a 100644
Binary files a/templates/boot/grub/tga.mod and b/templates/boot/grub/tga.mod differ
diff --git a/templates/boot/grub/trig.mod b/templates/boot/grub/trig.mod
new file mode 100644
index 0000000..8ac2ca3
Binary files /dev/null and b/templates/boot/grub/trig.mod differ
diff --git a/templates/boot/grub/true.mod b/templates/boot/grub/true.mod
index 18fd65c..c1497b2 100644
Binary files a/templates/boot/grub/true.mod and b/templates/boot/grub/true.mod differ
diff --git a/templates/boot/grub/udf.mod b/templates/boot/grub/udf.mod
index 97e23f4..058d745 100644
Binary files a/templates/boot/grub/udf.mod and b/templates/boot/grub/udf.mod differ
diff --git a/templates/boot/grub/ufs1.mod b/templates/boot/grub/ufs1.mod
index 2eff1fd..f42819e 100644
Binary files a/templates/boot/grub/ufs1.mod and b/templates/boot/grub/ufs1.mod differ
diff --git a/templates/boot/grub/ufs2.mod b/templates/boot/grub/ufs2.mod
index b9a19a0..0f7adc9 100644
Binary files a/templates/boot/grub/ufs2.mod and b/templates/boot/grub/ufs2.mod differ
diff --git a/templates/boot/grub/uhci.mod b/templates/boot/grub/uhci.mod
index 01b0832..97d23a3 100644
Binary files a/templates/boot/grub/uhci.mod and b/templates/boot/grub/uhci.mod differ
diff --git a/templates/boot/grub/usb.mod b/templates/boot/grub/usb.mod
index 0dba3ea..751522c 100644
Binary files a/templates/boot/grub/usb.mod and b/templates/boot/grub/usb.mod differ
diff --git a/templates/boot/grub/usb_keyboard.mod b/templates/boot/grub/usb_keyboard.mod
index 7383f09..a276e21 100644
Binary files a/templates/boot/grub/usb_keyboard.mod and b/templates/boot/grub/usb_keyboard.mod differ
diff --git a/templates/boot/grub/usbms.mod b/templates/boot/grub/usbms.mod
index 3072055..2583ffa 100644
Binary files a/templates/boot/grub/usbms.mod and b/templates/boot/grub/usbms.mod differ
diff --git a/templates/boot/grub/usbtest.mod b/templates/boot/grub/usbtest.mod
index 1fd8796..c434457 100644
Binary files a/templates/boot/grub/usbtest.mod and b/templates/boot/grub/usbtest.mod differ
diff --git a/templates/boot/grub/vbe.mod b/templates/boot/grub/vbe.mod
index b7982c1..445b540 100644
Binary files a/templates/boot/grub/vbe.mod and b/templates/boot/grub/vbe.mod differ
diff --git a/templates/boot/grub/vbeinfo.mod b/templates/boot/grub/vbeinfo.mod
index 45df10c..3864984 100644
Binary files a/templates/boot/grub/vbeinfo.mod and b/templates/boot/grub/vbeinfo.mod differ
diff --git a/templates/boot/grub/vbetest.mod b/templates/boot/grub/vbetest.mod
index 39b5d5b..dcb4950 100644
Binary files a/templates/boot/grub/vbetest.mod and b/templates/boot/grub/vbetest.mod differ
diff --git a/templates/boot/grub/vga.mod b/templates/boot/grub/vga.mod
index 2aeefdf..74193db 100644
Binary files a/templates/boot/grub/vga.mod and b/templates/boot/grub/vga.mod differ
diff --git a/templates/boot/grub/vga_text.mod b/templates/boot/grub/vga_text.mod
index 71b1f33..e31e9ae 100644
Binary files a/templates/boot/grub/vga_text.mod and b/templates/boot/grub/vga_text.mod differ
diff --git a/templates/boot/grub/video.mod b/templates/boot/grub/video.mod
index 42fb097..b048da3 100644
Binary files a/templates/boot/grub/video.mod and b/templates/boot/grub/video.mod differ
diff --git a/templates/boot/grub/video_fb.mod b/templates/boot/grub/video_fb.mod
index df0b518..9fc2732 100644
Binary files a/templates/boot/grub/video_fb.mod and b/templates/boot/grub/video_fb.mod differ
diff --git a/templates/boot/grub/videotest.mod b/templates/boot/grub/videotest.mod
index 419ca0c..96c479c 100644
Binary files a/templates/boot/grub/videotest.mod and b/templates/boot/grub/videotest.mod differ
diff --git a/templates/boot/grub/xfs.mod b/templates/boot/grub/xfs.mod
index 3fbf311..57550a5 100644
Binary files a/templates/boot/grub/xfs.mod and b/templates/boot/grub/xfs.mod differ
diff --git a/templates/boot/grub/xnu.mod b/templates/boot/grub/xnu.mod
index 824a043..75df5b3 100644
Binary files a/templates/boot/grub/xnu.mod and b/templates/boot/grub/xnu.mod differ
diff --git a/templates/boot/grub/xnu_uuid.mod b/templates/boot/grub/xnu_uuid.mod
index 9d4bda8..5638685 100644
Binary files a/templates/boot/grub/xnu_uuid.mod and b/templates/boot/grub/xnu_uuid.mod differ
diff --git a/templates/boot/grub/zfs.mod b/templates/boot/grub/zfs.mod
index 8cc30f4..3dffe64 100644
Binary files a/templates/boot/grub/zfs.mod and b/templates/boot/grub/zfs.mod differ
diff --git a/templates/boot/grub/zfsinfo.mod b/templates/boot/grub/zfsinfo.mod
index 496bd11..76a9b03 100644
Binary files a/templates/boot/grub/zfsinfo.mod and b/templates/boot/grub/zfsinfo.mod differ