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>

Author: mika

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,16 +101,19 @@ 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
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ohci.mod
 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,16 +274,19 @@ 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
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ohci.mod
 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,16 +452,19 @@ 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
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ohci.mod
 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

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