From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Jun 2010 10:41:41 +0000 (+0200)
Subject: update templates/boot/grub/ to grub version 1.98+20100617-1, extend grub.cfg, update... 
X-Git-Tag: v0.9.41~4
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=07ca6d51e817df41a480c6b6c183c40510acb97b

update templates/boot/grub/ to grub version 1.98+20100617-1, extend grub.cfg, update scripts/create-grub-dir.sh

scripts/create-grub-dir.sh needs to be adjusted for current
grub version because grub-mkimage is in another package
and requires a new option (--format).

grub.cfg now insmods part_gpt and part_msdos by default, otherwise
accessing partitions using "set root (hd0,..." isn't possible.
Also added support for ${kernelopts}, suggested by Alexander 'Leo'
Bergolth, see http://lists.mur.at/pipermail/grml/2010-June/004822.html

templates/boot/grub/ has been updated to grub version 1.98+20100617-1.

Signed-off-by: Michael Prokop <mika@grml.org>
---

diff --git a/debian/overrides.grml-live b/debian/overrides.grml-live
index f3ef849..43af938 100644
--- a/debian/overrides.grml-live
+++ b/debian/overrides.grml-live
@@ -19,12 +19,14 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cat.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/chain.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/charset.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cmostest.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cmp.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/configfile.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cpio.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cpuid.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/crc.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/crypto.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cs5536.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/datehook.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/date.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/datetime.mod
@@ -77,6 +79,7 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hexdump.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hfs.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hfsplus.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/iorw.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/iso9660.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/jfs.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/jpeg.mod
@@ -98,6 +101,7 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/msdospart.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/multiboot2.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/multiboot.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/nilfs2.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/normal.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ntfs.mod
@@ -105,9 +109,11 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_acorn.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_amiga.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_apple.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_bsd.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_gpt.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_msdos.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_sun.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_sunpc.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/parttool.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/password.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/password_pbkdf2.mod
@@ -123,6 +129,7 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/raid.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/read.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/reboot.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/regexp.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/reiserfs.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/relocator.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/scsi.mod
@@ -185,12 +192,14 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cat.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/chain.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/charset.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmostest.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmp.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/configfile.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cpio.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cpuid.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/crc.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/crypto.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cs5536.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/datehook.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/date.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/datetime.mod
@@ -243,6 +252,7 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hexdump.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hfs.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hfsplus.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/iorw.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/iso9660.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/jfs.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/jpeg.mod
@@ -264,6 +274,7 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/msdospart.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/multiboot2.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/multiboot.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/nilfs2.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/normal.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfs.mod
@@ -271,9 +282,11 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_acorn.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_amiga.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_apple.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_bsd.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_gpt.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_msdos.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sun.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sunpc.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/parttool.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/password.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/password_pbkdf2.mod
@@ -289,6 +302,7 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/raid.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/read.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/reboot.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/regexp.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/reiserfs.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/relocator.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/scsi.mod
@@ -358,12 +372,14 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cat.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/chain.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/charset.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmostest.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmp.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/configfile.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cpio.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cpuid.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/crc.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/crypto.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cs5536.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/datehook.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/date.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/datetime.mod
@@ -414,6 +430,7 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hexdump.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hfs.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hfsplus.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/iorw.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/iso9660.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/jfs.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/jpeg.mod
@@ -435,6 +452,7 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/msdospart.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/multiboot2.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/multiboot.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/nilfs2.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/normal.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfs.mod
@@ -442,9 +460,11 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_acorn.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_amiga.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_apple.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_bsd.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_gpt.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_msdos.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sun.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sunpc.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/parttool.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/password.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/password_pbkdf2.mod
@@ -460,6 +480,7 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/raid.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/read.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/reboot.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/regexp.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/reiserfs.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/relocator.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/scsi.mod
diff --git a/scripts/create-grub-dir.sh b/scripts/create-grub-dir.sh
index 0f3691c..681b0c0 100755
--- a/scripts/create-grub-dir.sh
+++ b/scripts/create-grub-dir.sh
@@ -6,12 +6,18 @@
 # License:       This file is licensed under the GPL v2 or any later version.
 # Latest change: Thu Mar 11 14:25:15 CET 2010 [mika]
 ################################################################################
+# This script is very hackish due to the way the grub directory has to be
+# generated. :-/ The script is meant to be executed on a Debian system that
+# matches the grub version, otherwise the execution of grub-mkimage *might* fail.
+# So if you want to use a recent Grub version make sure you execute this script
+# on an up2date Debian/unstable system.
+################################################################################
 
 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
+  echo "Usage: $0 <grub-version>">&2
+  echo "Usage example: $0 1.98-1">&2
   exit 1
 fi
 
@@ -23,25 +29,36 @@ fi
 GRUB="$1"
 oldpwd=$(pwd)
 
-if ! [ -f "$GRUB" ] ; then
-  wget http://ftp.de.debian.org/debian/pool/main/g/grub2/"$GRUB"
+ARCH=$(dpkg --print-architecture)
+
+if ! [ -f "grub-pc_${GRUB}_${ARCH}.deb" ] || ! [ -f "grub-common_${GRUB}_${ARCH}.deb" ]  ; then
+  wget http://cdn.debian.net/debian/pool/main/g/grub2/grub-pc_"${GRUB}"_${ARCH}.deb
+  wget http://cdn.debian.net/debian/pool/main/g/grub2/grub-common_"${GRUB}"_${ARCH}.deb
 fi
 
-if ! [ -f "$GRUB" ] ; then
-  echo "Error reading $GRUB - exiting.">&2
+if ! [ -f "grub-pc_${GRUB}_${ARCH}.deb" ] || ! [ -f "grub-common_${GRUB}_${ARCH}.deb" ]  ; then
+  echo "Error reading grub files version $GRUB - exiting.">&2
   exit 1
 fi
 
 GRUBDIR=$(mktemp -d)
+echo "Using temporary directory $GRUBDIR"
 cd "$GRUBDIR"
 
 mkdir -p grub
 
-ar x "${oldpwd}"/"$GRUB"
+ar x "${oldpwd}"/"grub-pc_${GRUB}_${ARCH}.deb"
+tar xzf data.tar.gz
+ar x "${oldpwd}"/"grub-common_${GRUB}_${ARCH}.deb"
 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 \
+if ./usr/bin/grub-mkimage --help | grep -q -- --format ; then
+  ./usr/bin/grub-mkimage -d usr/lib/grub/*-pc -o core.img biosdisk iso9660 --format=i386-pc
+else
+  ./usr/bin/grub-mkimage -d usr/lib/grub/*-pc -o core.img biosdisk iso9660
+fi
+
+for a in usr/lib/grub/*-pc/{*.mod,efiemu??.o,command.lst,moddep.lst,fs.lst,handler.lst,parttool.lst}; do \
   [[ -e $a ]] && cp $a grub/
 done
 
diff --git a/templates/boot/grub/915resolution.mod b/templates/boot/grub/915resolution.mod
index a818a6f..d557183 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 5448b56..7e5f779 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 b76ac00..7c5f949 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 3a6ebeb..1e65180 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 a02c3fc..46f6653 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/at_keyboard.mod b/templates/boot/grub/at_keyboard.mod
index 69b08c5..506248d 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 450ba09..fc348ed 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 d4d5c36..75e38fd 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 2bcec10..5a6f9f3 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 9a3039a..67b173d 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 3fee204..15467dd 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 fc26346..6c901ee 100644
Binary files a/templates/boot/grub/bitmap.mod and b/templates/boot/grub/bitmap.mod differ
diff --git a/templates/boot/grub/blocklist.mod b/templates/boot/grub/blocklist.mod
index 8a1f08d..7776610 100644
Binary files a/templates/boot/grub/blocklist.mod and b/templates/boot/grub/blocklist.mod differ
diff --git a/templates/boot/grub/bsd.mod b/templates/boot/grub/bsd.mod
index 990a837..5dd1941 100644
Binary files a/templates/boot/grub/bsd.mod and b/templates/boot/grub/bsd.mod differ
diff --git a/templates/boot/grub/bufio.mod b/templates/boot/grub/bufio.mod
index a580add..972c1cd 100644
Binary files a/templates/boot/grub/bufio.mod and b/templates/boot/grub/bufio.mod differ
diff --git a/templates/boot/grub/chain.mod b/templates/boot/grub/chain.mod
index 2628720..1e9b93f 100644
Binary files a/templates/boot/grub/chain.mod and b/templates/boot/grub/chain.mod differ
diff --git a/templates/boot/grub/cmostest.mod b/templates/boot/grub/cmostest.mod
new file mode 100644
index 0000000..6da134e
Binary files /dev/null and b/templates/boot/grub/cmostest.mod differ
diff --git a/templates/boot/grub/command.lst b/templates/boot/grub/command.lst
index bcb1381..18abe85 100644
--- a/templates/boot/grub/command.lst
+++ b/templates/boot/grub/command.lst
@@ -13,6 +13,9 @@
 *hello: hello
 *help: help
 *hexdump: hexdump
+*inb: iorw
+*inl: iorw
+*inw: iorw
 *keystatus: keystatus
 *kfreebsd: bsd
 *knetbsd: bsd
@@ -43,6 +46,7 @@ boot: boot
 cat: minicmd
 chainloader: chain
 clear: minicmd
+cmostest: cmostest
 cmp: cmp
 configfile: configfile
 crc: crc
@@ -55,7 +59,6 @@ exit: minicmd
 export: normal
 false: true
 gptsync: gptsync
-handler: handler
 help: minicmd
 initrd16: linux16
 initrd: linux
@@ -68,12 +71,15 @@ loadfont: font
 lsfonts: font
 lsmmap: lsmmap
 lsmod: minicmd
+module2: multiboot2
 module: multiboot
-module: multiboot2
 multiboot2: multiboot2
 multiboot: multiboot
 normal: normal
 normal_exit: normal
+outb: iorw
+outl: iorw
+outw: iorw
 parttool: parttool
 password: password
 password_pbkdf2: password_pbkdf2
@@ -81,6 +87,7 @@ play: play
 pxe_unload: pxecmd
 read: read
 reboot: reboot
+regexp: regexp
 rmmod: minicmd
 root: minicmd
 search.file: search_fs_file
diff --git a/templates/boot/grub/core.img b/templates/boot/grub/core.img
index 73a78df..ec5fc99 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 17d0ae3..e9d027c 100644
Binary files a/templates/boot/grub/cpio.mod and b/templates/boot/grub/cpio.mod differ
diff --git a/templates/boot/grub/crypto.mod b/templates/boot/grub/crypto.mod
index ad1b2e1..105ada4 100644
Binary files a/templates/boot/grub/crypto.mod and b/templates/boot/grub/crypto.mod differ
diff --git a/templates/boot/grub/cs5536.mod b/templates/boot/grub/cs5536.mod
new file mode 100644
index 0000000..f9065f5
Binary files /dev/null and b/templates/boot/grub/cs5536.mod differ
diff --git a/templates/boot/grub/datehook.mod b/templates/boot/grub/datehook.mod
index 0298ed4..6042db5 100644
Binary files a/templates/boot/grub/datehook.mod and b/templates/boot/grub/datehook.mod differ
diff --git a/templates/boot/grub/drivemap.mod b/templates/boot/grub/drivemap.mod
index e1de992..0eae020 100644
Binary files a/templates/boot/grub/drivemap.mod and b/templates/boot/grub/drivemap.mod differ
diff --git a/templates/boot/grub/efiemu.mod b/templates/boot/grub/efiemu.mod
index dcf60e0..8796f15 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 bef8c8d..0b7b678 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 d4a30fe..6f243ad 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 cd1bfcf..45f7642 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
index d30cb5b..2fa6409 100644
Binary files a/templates/boot/grub/example_functional_test.mod 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 ad7328e..10333c3 100644
Binary files a/templates/boot/grub/ext2.mod and b/templates/boot/grub/ext2.mod differ
diff --git a/templates/boot/grub/fat.mod b/templates/boot/grub/fat.mod
index a2262c0..30cd116 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 36821e0..bf0bd66 100644
Binary files a/templates/boot/grub/font.mod and b/templates/boot/grub/font.mod differ
diff --git a/templates/boot/grub/fs.lst b/templates/boot/grub/fs.lst
index c9ac3bf..a8b2ea2 100644
--- a/templates/boot/grub/fs.lst
+++ b/templates/boot/grub/fs.lst
@@ -11,6 +11,7 @@ hfsplus
 iso9660
 jfs
 minix
+nilfs2
 ntfs
 pxe
 reiserfs
diff --git a/templates/boot/grub/functional_test.mod b/templates/boot/grub/functional_test.mod
index 9febe5b..d8225a4 100644
Binary files a/templates/boot/grub/functional_test.mod and b/templates/boot/grub/functional_test.mod differ
diff --git a/templates/boot/grub/gcry_md4.mod b/templates/boot/grub/gcry_md4.mod
index 78f9fba..6965250 100644
Binary files a/templates/boot/grub/gcry_md4.mod 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
index 8773b44..98a3b45 100644
Binary files a/templates/boot/grub/gcry_md5.mod and b/templates/boot/grub/gcry_md5.mod differ
diff --git a/templates/boot/grub/gcry_rmd160.mod b/templates/boot/grub/gcry_rmd160.mod
index 0c74219..ec6103e 100644
Binary files a/templates/boot/grub/gcry_rmd160.mod and b/templates/boot/grub/gcry_rmd160.mod differ
diff --git a/templates/boot/grub/gcry_serpent.mod b/templates/boot/grub/gcry_serpent.mod
index 5471136..53dbae5 100644
Binary files a/templates/boot/grub/gcry_serpent.mod 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
index ff89806..5aa7b0f 100644
Binary files a/templates/boot/grub/gcry_sha1.mod 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
index 17e59fb..0574d52 100644
Binary files a/templates/boot/grub/gcry_sha256.mod 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
index b123433..8fec2c2 100644
Binary files a/templates/boot/grub/gcry_sha512.mod 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
index bdc683c..e1d306c 100644
Binary files a/templates/boot/grub/gcry_tiger.mod and b/templates/boot/grub/gcry_tiger.mod differ
diff --git a/templates/boot/grub/gcry_whirlpool.mod b/templates/boot/grub/gcry_whirlpool.mod
index 219490b..c6c0c6e 100644
Binary files a/templates/boot/grub/gcry_whirlpool.mod and b/templates/boot/grub/gcry_whirlpool.mod differ
diff --git a/templates/boot/grub/gettext.mod b/templates/boot/grub/gettext.mod
index 17f6d50..2ff8468 100644
Binary files a/templates/boot/grub/gettext.mod and b/templates/boot/grub/gettext.mod differ
diff --git a/templates/boot/grub/gfxmenu.mod b/templates/boot/grub/gfxmenu.mod
index 449e97b..b07dc97 100644
Binary files a/templates/boot/grub/gfxmenu.mod and b/templates/boot/grub/gfxmenu.mod differ
diff --git a/templates/boot/grub/gfxterm.mod b/templates/boot/grub/gfxterm.mod
index 5bf07f1..771d794 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 2bd0505..d91de35 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 31545bd..0cb37b1 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -20,13 +20,17 @@ else
   set menu_color_highlight=black/yellow
 fi
 
+# make sure we can access partitions
+insmod part_msdos
+insmod part_gpt
+
 if [ ${iso_path} ] ; then
     set loopback="findiso=${iso_path}"
 fi
 
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
     set gfxpayload=1024x768
-    linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% "${loopback}" nomce 
+    linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 
     initrd  /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -73,55 +77,55 @@ menuentry "Boot OS of first partition on first disk" {
 
 menuentry "%GRML_NAME% - enable persistent mode" {
     set gfxpayload=1024x768x16,1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet persistent 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet persistent 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy Grml to RAM" {
     set gfxpayload=1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet toram=%GRML_NAME%.squashfs 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram=%GRML_NAME%.squashfs 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
     set gfxpayload=1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet toram 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
     set gfxpayload=1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet startx=wm-ng 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx=wm-ng 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - disable framebuffer" {
     set gfxpayload=text
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quietvideo=ofonly 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quietvideo=ofonly 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - forensic mode" {
     set gfxpayload=1024x768
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - failsafe mode" {
     set gfxpayload=text
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - debug mode" {
     set gfxpayload=1024x768
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" initcall verbose debug=vc 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - serial mode" {
     set gfxpayload=text
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet video=vesafb:off console=tty1 console=ttyS0,9600n8 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
diff --git a/templates/boot/grub/gzio.mod b/templates/boot/grub/gzio.mod
index babfbe4..c709d96 100644
Binary files a/templates/boot/grub/gzio.mod and b/templates/boot/grub/gzio.mod differ
diff --git a/templates/boot/grub/handler.lst b/templates/boot/grub/handler.lst
index 90212c4..e69de29 100644
--- a/templates/boot/grub/handler.lst
+++ b/templates/boot/grub/handler.lst
@@ -1 +0,0 @@
-parser.grub: sh
diff --git a/templates/boot/grub/hashsum.mod b/templates/boot/grub/hashsum.mod
index 4d3c7ba..9c02d88 100644
Binary files a/templates/boot/grub/hashsum.mod and b/templates/boot/grub/hashsum.mod differ
diff --git a/templates/boot/grub/hdparm.mod b/templates/boot/grub/hdparm.mod
index e7d57cb..60deef5 100644
Binary files a/templates/boot/grub/hdparm.mod and b/templates/boot/grub/hdparm.mod differ
diff --git a/templates/boot/grub/help.mod b/templates/boot/grub/help.mod
index b5d193b..672653d 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 4283247..3051b5b 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 5e4781f..caf59b8 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 2b7c35c..d5e787b 100644
Binary files a/templates/boot/grub/hfsplus.mod and b/templates/boot/grub/hfsplus.mod differ
diff --git a/templates/boot/grub/iorw.mod b/templates/boot/grub/iorw.mod
new file mode 100644
index 0000000..335198a
Binary files /dev/null and b/templates/boot/grub/iorw.mod differ
diff --git a/templates/boot/grub/iso9660.mod b/templates/boot/grub/iso9660.mod
index 3b71a2c..b16fa6c 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 16c389e..3a44c1b 100644
Binary files a/templates/boot/grub/jfs.mod and b/templates/boot/grub/jfs.mod differ
diff --git a/templates/boot/grub/jpeg.mod b/templates/boot/grub/jpeg.mod
index 67dfbe2..414bda7 100644
Binary files a/templates/boot/grub/jpeg.mod and b/templates/boot/grub/jpeg.mod differ
diff --git a/templates/boot/grub/keystatus.mod b/templates/boot/grub/keystatus.mod
index ad48299..e6034e5 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 b9a9c6d..3a857e5 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 951dc52..aa5e737 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 5a380d3..d43bf6e 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 425a3f3..e60e281 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 0e47665..7dbfd77 100644
Binary files a/templates/boot/grub/ls.mod and b/templates/boot/grub/ls.mod differ
diff --git a/templates/boot/grub/memdisk.mod b/templates/boot/grub/memdisk.mod
index 457969a..6d824e0 100644
Binary files a/templates/boot/grub/memdisk.mod and b/templates/boot/grub/memdisk.mod differ
diff --git a/templates/boot/grub/minicmd.mod b/templates/boot/grub/minicmd.mod
index 84c767b..0cc25aa 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 47f4f9d..f044408 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 d66db82..d83bac4 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 a8e741c..ac790b6 100644
--- a/templates/boot/grub/moddep.lst
+++ b/templates/boot/grub/moddep.lst
@@ -1,158 +1,164 @@
-gcry_des: crypto
-videotest: font video
-loopback: extcmd
-memrw: extcmd
-terminfo:
-part_gpt:
-gcry_arcfour: crypto
-read:
-aout:
-elf: gzio
-vga_text:
-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: 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: bitmap_scale font extcmd bitmap video
-functional_test: extcmd
-xfs: fshelp
-sleep: extcmd normal
-vbetest: vbe video
-pxecmd: pxe
-memdisk:
-gcry_rijndael: crypto
-gcry_sha1: crypto
-gettext: normal gzio
-cmp: gzio
-befs_be: fshelp
-hashsum: crypto extcmd normal
-halt: extcmd
-usb:
+date: datetime normal
 search_fs_uuid:
-keystatus: extcmd
-linux: normal boot video mmap
+gcry_twofish: crypto
+multiboot2: boot gzio video relocator mmap
+uhci: pci usb
+cmostest:
+gcry_rijndael: crypto
+echo: extcmd
+cpio:
+gcry_cast5: crypto
+gcry_sha512: crypto
+boot:
 part_sun:
-mdraid: raid
-bufio:
-handler:
-cpuid: extcmd
-gcry_blowfish: crypto
-hdparm: extcmd
-test:
-minicmd:
-ata: scsi pci
 gzio:
-udf: fshelp
-terminal:
+ls: extcmd normal
+gfxterm: video extcmd bitmap_scale bitmap font
+video:
+gcry_serpent: crypto
+gcry_tiger: crypto
+aout:
+gcry_blowfish: crypto
+extcmd:
+at_keyboard:
+minix:
+pxe: bufio
+reboot:
 xnu_uuid: gcry_md5
-uhci: usb pci
-crypto:
-raid:
-gcry_sha512: crypto
-biosdisk:
-password: crypto normal
-fshelp:
-efiemu: charset crc acpi
-mmap: boot
-xnu: bitmap_scale charset extcmd boot bitmap video relocator efiemu gzio
-zfsinfo: zfs
+help: extcmd charset normal
+usbms: usb scsi
+usbtest: usb
 blocklist:
-ext2: fshelp
-drivemap: extcmd boot mmap
-part_acorn:
-sh: normal
-lsmmap:
-bitmap:
-ntfs: fshelp
-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
+part_msdos:
+gcry_rfc2268: crypto
+pbkdf2: crypto
+probe: extcmd
+gcry_camellia: crypto
 fat:
-charset:
-zfs:
-raid6rec: raid
+gcry_md4: crypto
+parttool: normal
+pci:
+linux: boot video mmap normal
+zfsinfo: zfs
+gcry_md5: crypto
+fshelp:
+usb_keyboard: usb
 bitmap_scale: bitmap
-loadenv: extcmd
+ata: pci scsi
+gcry_des: crypto
 datehook: datetime normal
-probe: extcmd
-tar:
-hfs:
-boot:
-vbeinfo: vbe
-relocator:
-acpi: extcmd gzio mmap
-usbtest: usb
-tga: bufio bitmap
-reboot:
-befs: fshelp
-serial: extcmd terminfo
 dm_nv: raid
-font: bufio video
-raid5rec: raid
-example_functional_test: functional_test
-video:
+reiserfs: fshelp
+afs_be: fshelp
+efiemu: acpi crc charset
+gcry_seed: crypto
+crypto:
+terminal:
+jpeg: bufio bitmap
+test:
+bsd: boot gzio video aout extcmd elf cpuid mmap
+memdisk:
+cmp: gzio
+gfxmenu: gfxterm video trig bitmap_scale bitmap normal font
+acpi: gzio extcmd mmap
+elf: gzio
+affs: fshelp
+xfs: fshelp
+cpuid: extcmd
 crc:
-gcry_cast5: crypto
-hfsplus: fshelp
-extcmd:
-gcry_whirlpool: crypto
-gcry_tiger: crypto
-pxe: bufio
+usb: pci
+videotest: video font
+play:
+relocator:
+password: crypto normal
+mdraid: raid
+part_sunpc:
+pxecmd: pxe
 video_fb: video
-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
+sleep: extcmd normal
+serial: extcmd terminfo
+gcry_rmd160: crypto
 gcry_sha256: crypto
-pbkdf2: crypto
-date: datetime normal
-ls: extcmd normal
-ntfscomp: ntfs
+search_fs_file:
+search: search_fs_uuid extcmd search_fs_file search_label
+chain: boot video
+memrw: extcmd
+cs5536: pci
+ata_pthru: ata
+gcry_crc: crypto
+password_pbkdf2: gcry_sha512 pbkdf2 crypto normal
+configfile: normal
+befs: fshelp
+linux16: boot video mmap
+gcry_arcfour: crypto
+charset:
+raid5rec: raid
+gettext: gzio normal
 hello: extcmd
-scsi:
-normal: terminal crypto charset boot
-cat: gzio
-linux16: video boot mmap
-lvm:
-ufs1:
-chain: video boot
-search_label:
+hashsum: extcmd crypto normal
+vga_text:
+vbeinfo: vbe
+regexp:
 gptsync:
+part_gpt:
+ohci: boot pci usb cs5536
+zfs:
+bufio:
+part_apple:
+hdparm: extcmd
+bitmap:
+true:
+terminfo:
+hfs:
+ntfscomp: ntfs
+biosdisk:
+ufs1:
+915resolution: extcmd
+gcry_sha1: crypto
+lsmmap:
+nilfs2: fshelp
 ufs2:
+befs_be: fshelp
+mmap: boot
+png: bufio bitmap
+tar:
+hfsplus: fshelp
+lspci: extcmd pci
+tga: bufio bitmap
+functional_test: extcmd
+scsi:
+lvm:
+raid:
 setpci: extcmd pci
-gcry_rfc2268: crypto
-multiboot2: boot video relocator gzio mmap
+iso9660: fshelp
+search_label:
+msdospart: parttool
+raid6rec: raid
+udf: fshelp
+vbe: video video_fb
+halt: extcmd
+keystatus: extcmd
+read:
+multiboot: boot gzio video relocator mmap
+xnu: boot gzio video extcmd bitmap_scale efiemu relocator charset bitmap
+normal: boot crypto terminal charset
+loopback: extcmd
 part_amiga:
-play:
-echo: extcmd
-minix:
-gcry_serpent: crypto
-gcry_md4: crypto
-gcry_md5: crypto
-gcry_camellia: crypto
-part_msdos:
-at_keyboard:
+sfs: fshelp
+jfs:
+vbetest: video vbe
+cat: gzio
+part_acorn:
+afs: fshelp
+iorw: extcmd
+hexdump: gzio extcmd
+gcry_whirlpool: crypto
+loadenv: extcmd
+minicmd:
+drivemap: boot extcmd mmap
+example_functional_test: functional_test
+font: video bufio
+part_bsd:
+ext2: fshelp
+vga: video video_fb
+ntfs: fshelp
diff --git a/templates/boot/grub/msdospart.mod b/templates/boot/grub/msdospart.mod
index b72317b..a67697a 100644
Binary files a/templates/boot/grub/msdospart.mod and b/templates/boot/grub/msdospart.mod differ
diff --git a/templates/boot/grub/multiboot.mod b/templates/boot/grub/multiboot.mod
index 8d741bf..b647f8d 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
index 5380aa9..cea2d56 100644
Binary files a/templates/boot/grub/multiboot2.mod and b/templates/boot/grub/multiboot2.mod differ
diff --git a/templates/boot/grub/nilfs2.mod b/templates/boot/grub/nilfs2.mod
new file mode 100644
index 0000000..732aff2
Binary files /dev/null and b/templates/boot/grub/nilfs2.mod differ
diff --git a/templates/boot/grub/normal.mod b/templates/boot/grub/normal.mod
index d1888e3..bd69f1e 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 3dd6227..5c43586 100644
Binary files a/templates/boot/grub/ntfs.mod and b/templates/boot/grub/ntfs.mod differ
diff --git a/templates/boot/grub/ohci.mod b/templates/boot/grub/ohci.mod
index 1d42ede..42cf514 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 5ea7883..a08dd06 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 b855df2..cbd7c76 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 2957adb..abf93fb 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_bsd.mod b/templates/boot/grub/part_bsd.mod
new file mode 100644
index 0000000..5f585c3
Binary files /dev/null and b/templates/boot/grub/part_bsd.mod differ
diff --git a/templates/boot/grub/part_gpt.mod b/templates/boot/grub/part_gpt.mod
index 3749229..3322cb2 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 3d05ae5..a709077 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 3d12454..472c999 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/part_sunpc.mod b/templates/boot/grub/part_sunpc.mod
new file mode 100644
index 0000000..15c0ddb
Binary files /dev/null and b/templates/boot/grub/part_sunpc.mod differ
diff --git a/templates/boot/grub/parttool.lst b/templates/boot/grub/parttool.lst
index 8514e9a..68b4b5c 100644
--- a/templates/boot/grub/parttool.lst
+++ b/templates/boot/grub/parttool.lst
@@ -1 +1 @@
-part_msdos: msdospart
+msdos: msdospart
diff --git a/templates/boot/grub/parttool.mod b/templates/boot/grub/parttool.mod
index 6527bd2..44967a6 100644
Binary files a/templates/boot/grub/parttool.mod and b/templates/boot/grub/parttool.mod differ
diff --git a/templates/boot/grub/password_pbkdf2.mod b/templates/boot/grub/password_pbkdf2.mod
index 1f24939..08d31cf 100644
Binary files a/templates/boot/grub/password_pbkdf2.mod and b/templates/boot/grub/password_pbkdf2.mod differ
diff --git a/templates/boot/grub/pci.mod b/templates/boot/grub/pci.mod
index 358abc4..4cc63a6 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 de2c7ad..67faa45 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 9f20e41..3ecfcee 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 8580a69..6544a21 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 3d12543..485a3c8 100644
Binary files a/templates/boot/grub/pxe.mod and b/templates/boot/grub/pxe.mod differ
diff --git a/templates/boot/grub/raid.mod b/templates/boot/grub/raid.mod
index 8ef915f..3674761 100644
Binary files a/templates/boot/grub/raid.mod and b/templates/boot/grub/raid.mod differ
diff --git a/templates/boot/grub/regexp.mod b/templates/boot/grub/regexp.mod
new file mode 100644
index 0000000..af78a7b
Binary files /dev/null and b/templates/boot/grub/regexp.mod differ
diff --git a/templates/boot/grub/reiserfs.mod b/templates/boot/grub/reiserfs.mod
index 2bebea9..041502f 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
index 43b895f..c2a725d 100644
Binary files a/templates/boot/grub/relocator.mod and b/templates/boot/grub/relocator.mod differ
diff --git a/templates/boot/grub/scsi.mod b/templates/boot/grub/scsi.mod
index ca5b30f..a988556 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 ca27937..2953df8 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
index 4ec173c..2661c6b 100644
Binary files a/templates/boot/grub/search_fs_file.mod 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
index 57bf81e..752abc7 100644
Binary files a/templates/boot/grub/search_fs_uuid.mod 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
index 4250f9c..31284a1 100644
Binary files a/templates/boot/grub/search_label.mod and b/templates/boot/grub/search_label.mod differ
diff --git a/templates/boot/grub/serial.mod b/templates/boot/grub/serial.mod
index 2ac35e3..69a714a 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
index c58e01b..294c4c0 100644
Binary files a/templates/boot/grub/setpci.mod and b/templates/boot/grub/setpci.mod differ
diff --git a/templates/boot/grub/sfs.mod b/templates/boot/grub/sfs.mod
index ff7b56a..1933577 100644
Binary files a/templates/boot/grub/sfs.mod and b/templates/boot/grub/sfs.mod differ
diff --git a/templates/boot/grub/tar.mod b/templates/boot/grub/tar.mod
index dc8e950..da634c2 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
index da1dd50..8e0251b 100644
Binary files a/templates/boot/grub/terminal.mod and b/templates/boot/grub/terminal.mod differ
diff --git a/templates/boot/grub/test.mod b/templates/boot/grub/test.mod
index 1f37b97..d2d504d 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 fb6e53a..18a5682 100644
Binary files a/templates/boot/grub/tga.mod and b/templates/boot/grub/tga.mod differ
diff --git a/templates/boot/grub/udf.mod b/templates/boot/grub/udf.mod
index 058d745..5e7cae7 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 f42819e..3ae0243 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 0f7adc9..34376a6 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 97d23a3..3e07369 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 751522c..492bbec 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 a276e21..9d76b9d 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 2583ffa..fa8feca 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 c434457..2df68b8 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 445b540..2cabdf5 100644
Binary files a/templates/boot/grub/vbe.mod and b/templates/boot/grub/vbe.mod differ
diff --git a/templates/boot/grub/vbetest.mod b/templates/boot/grub/vbetest.mod
index dcb4950..3638adf 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 74193db..4a0a6b8 100644
Binary files a/templates/boot/grub/vga.mod and b/templates/boot/grub/vga.mod differ
diff --git a/templates/boot/grub/video.mod b/templates/boot/grub/video.mod
index b048da3..fc71233 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 9fc2732..2f41ed8 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 96c479c..7249731 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 57550a5..8d8224d 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 75df5b3..40b4d33 100644
Binary files a/templates/boot/grub/xnu.mod and b/templates/boot/grub/xnu.mod differ
diff --git a/templates/boot/grub/zfs.mod b/templates/boot/grub/zfs.mod
index 3dffe64..cf4d6ef 100644
Binary files a/templates/boot/grub/zfs.mod and b/templates/boot/grub/zfs.mod differ