Integrate grub2 for hybrid boot

diff --git a/debian/changelog b/debian/changelog
index 401527d..c239793 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-live (0.9.18) UNRELEASED; urgency=low
+
+  * Integrate grub2 for hybrid boot. Big thanks to Thorsten Glaser
+    for his work and help.
+
+ -- Michael Prokop <mika@grml.org>  Wed, 03 Jun 2009 23:59:23 +0200
+
 grml-live (0.9.17) unstable; urgency=low
 
   [ Frank Terbeck ]

diff --git a/debian/control b/debian/control
index ffcee99..f2c261e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.grml.org/?p=grml-live.git
 
 Package: grml-live
 Architecture: all
-Depends: ${misc:Depends}, fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs | genisoimage, squashfs-lzma-tools | squashfs-tools, wget, moreutils
+Depends: ${misc:Depends}, fai-client (>= 3.2.4), fai-server (>= 3.2.4), memtest86+ [i386 amd64], mkisofs | genisoimage, squashfs-lzma-tools | squashfs-tools, wget, moreutils, mksh
 Recommends: grml-live-addons
 Suggests: fai-doc
 Description: build system for creating a grml (based) live-cd

diff --git a/debian/overrides.grml-live b/debian/overrides.grml-live
index 170c37d..9f7be68 100644 (file)
--- a/debian/overrides.grml-live
+++ b/debian/overrides.grml-live
@@ -1,7 +1,369 @@
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/acorn.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/acpi.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/affs.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/afs.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/amiga.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/aout.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/apple.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ata.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ata_pthru.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/at_keyboard.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/biosdisk.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/bitmap.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/blocklist.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/boot.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/_bsd.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/bsd.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/bufio.mod
+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/chain.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/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
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/dm_nv.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/drivemap.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/echo.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/efiemu32.o
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/efiemu64.o
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/efiemu.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/elf.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ext2.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/extcmd.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/fat.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/font.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/fshelp.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/fs_uuid.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gfxterm.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gpt.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gptsync.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gzio.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/halt.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/handler.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hdparm.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hello.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/help.mod
+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/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
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/linux16.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/_linux.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/linux.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/loadenv.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/loopback.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/lsmmap.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ls.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/lspci.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/lua.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/lvm.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/mdraid.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/memdisk.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/memrw.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/minicmd.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/minix.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/mmap.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/multiboot.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/parttool.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/pci.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/pc.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/pcpart.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/play.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/png.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/pxecmd.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/pxe.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/raid5rec.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/raid6rec.mod
+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/reiserfs.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/scsi.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/search.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/serial.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/setjmp.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/sfs.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/sh.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/sleep.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/sun.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/tar.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/terminal.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/terminfo.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/test.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/tga.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/udf.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ufs.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/uhci.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/usb_keyboard.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/usb.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/usbms.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/usbtest.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/vbeinfo.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/vbe.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/vbetest.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/vga.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/vga_text.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/video.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/videotest.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/xfs.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/xnu.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/acorn.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/acpi.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/affs.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/afs.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/amiga.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/aout.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/apple.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ata.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ata_pthru.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/at_keyboard.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/biosdisk.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/bitmap.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/blocklist.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/boot.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/_bsd.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/bsd.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/bufio.mod
+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/chain.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/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
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/dm_nv.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/drivemap.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/echo.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/efiemu32.o
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/efiemu64.o
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/efiemu.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/elf.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ext2.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/extcmd.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/fat.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/font.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/fshelp.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/fs_uuid.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gfxterm.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gpt.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gptsync.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gzio.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/halt.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/handler.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hdparm.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hello.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/help.mod
+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/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
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/linux16.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/_linux.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/linux.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/loadenv.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/loopback.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/lsmmap.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ls.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/lspci.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/lua.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/lvm.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/mdraid.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/memdisk.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/memrw.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/minicmd.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/minix.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/mmap.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/multiboot.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/parttool.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/pci.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/pc.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/pcpart.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/play.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/png.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/pxecmd.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/pxe.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/raid5rec.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/raid6rec.mod
+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/reiserfs.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/scsi.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/search.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/serial.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/setjmp.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/sfs.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/sh.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/sleep.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/sun.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/tar.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/terminal.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/terminfo.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/test.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/tga.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/udf.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ufs.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/uhci.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/usb_keyboard.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/usb.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/usbms.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/usbtest.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/vbeinfo.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/vbe.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/vbetest.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/vga.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/vga_text.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/video.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/videotest.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/xfs.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/xnu.mod
 grml-live: depends-on-obsolete-package depends: mkisofs
 grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.bat
 grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.inf
 grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.pif
 grml-live: extra-license-file usr/share/grml-live/templates/boot/addons/bsd4grml/LICENCE.TXT
 grml-live: extra-license-file usr/share/grml-live/templates/GRML/LICENSE.txt
+grml-live: script-not-executable ./usr/share/grml-live/scripts/bootgrub.mksh
 grml-live: unknown-section grml
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/acorn.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/acpi.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/affs.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/afs.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/amiga.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/aout.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/apple.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ata.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ata_pthru.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/at_keyboard.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/biosdisk.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/bitmap.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/blocklist.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/boot.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/_bsd.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/bsd.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/bufio.mod
+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/chain.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/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
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/dm_nv.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/drivemap.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/echo.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/efiemu.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/elf.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ext2.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/extcmd.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/fat.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/font.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/fshelp.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/fs_uuid.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gfxterm.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gpt.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gptsync.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gzio.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/halt.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/handler.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hdparm.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hello.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/help.mod
+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/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
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/linux16.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/_linux.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/linux.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/loadenv.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/loopback.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/lsmmap.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ls.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/lspci.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/lua.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/lvm.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/mdraid.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/memdisk.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/memrw.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/minicmd.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/minix.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/mmap.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/multiboot.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/parttool.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/pci.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/pc.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/pcpart.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/play.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/png.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/pxecmd.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/pxe.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/raid5rec.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/raid6rec.mod
+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/reiserfs.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/scsi.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/search.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/serial.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/setjmp.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/sfs.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/sh.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/sleep.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/sun.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/tar.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/terminal.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/terminfo.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/test.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/tga.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/udf.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ufs.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/uhci.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/usb_keyboard.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/usb.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/usbms.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/usbtest.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/vbeinfo.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/vbe.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/vbetest.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/vga.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/vga_text.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/video.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/videotest.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/xfs.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/xnu.mod

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index 0ac6bb2..20ccfee 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -121,6 +121,13 @@ GRML_FAI_CONFIG=/etc/grml/fai
 # Do you want to skip adding /boot/addons/bsd4grml/ (from the template directory)?
 # NO_ADDONS_BSD4GRML='1'
 
+# By default the ISO is created for hybrid boot, so you can either
+# boot the CD using normal el torito mode or copy it to USB device
+# *without* having to run grml2usb (like: 'dd if=grml.iso of=/dev/sdX')
+# - working both with the same ISO
+# HYBRID_METHOD='disable'   # do not create a hybrid ISO
+# HYBRID_METHOD='isohybrid' # use isohybrid instead of the default (being manifold) 
+
 # exclude files from compressed squashfs file using the
 # the mksquashfs option -ef:
 # SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"

diff --git a/grml-live b/grml-live
index 8b8ed40..0e0a639 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -14,7 +14,7 @@ export LC_ALL=C
 # exit on any error:
 set -e
 
-GRML_LIVE_VERSION='0.9.17'
+GRML_LIVE_VERSION='0.9.18'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 ISO_DATE="$(date +%Y-%m-%d)"
@@ -559,7 +559,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
            for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do
                test -f $file && cp $file "$BUILD_OUTPUT"/boot/addons/
            done
-  
+
            if [ -z "$NO_ADDONS_BSD4GRML" ] ; then
               cp -a ${TEMPLATE_DIRECTORY}/boot/addons/bsd4grml "$BUILD_OUTPUT"/boot/addons/
            fi
@@ -602,6 +602,9 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       sed -i "s/%VERSION%/$VERSION/"           "$BUILD_OUTPUT"/boot/grub/menu.lst
       sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/grub/menu.lst
 
+      sed -i "s/%VERSION%/$VERSION/"           "$BUILD_OUTPUT"/boot/grub/grub.cfg
+      sed -i "s/%GRML_NAME%/$SHORT_GRML_NAME/" "$BUILD_OUTPUT"/boot/grub/grub.cfg
+
       # make sure the squashfs filename is set accordingly:
       GRML_NAME_SQUASHFS="$GRML_NAME.squashfs"
       sed -i "s/%GRML_NAME_SQUASHFS%/$GRML_NAME_SQUASHFS/" "$BUILD_OUTPUT"/boot/isolinux/isolinux.cfg
@@ -735,6 +738,33 @@ else
               -b $BOOT_FILE \
               -o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?
 
+      # support disabling hybrid ISO image
+      if [ "$HYBRID_METHOD" = "disable" ] ; then\
+         log "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable"
+         einfo "Skipping creation of hybrid ISO file as requested via HYBRID_METHOD=disable"
+         eend 0
+      # use isohybrid only on request
+      elif [ "$HYBRID_METHOD" = "isohybrid" ] ; then
+         if ! which isohybrid >/dev/null 2>&1 ; then
+           bailout 12 "isohybrid binary not found - please install syslinux/syslinux-common"
+         else
+           log "Creating hybrid ISO file with isohybrid method"
+           einfo "Creating hybrid ISO file with isohybrid method"
+           isohybrid "${ISO_OUTPUT}/${ISO_NAME}"
+           eend $?
+         fi
+      # by default use our manifold boot method:
+      else
+         if ! [ -r boot/grub/core.img ] ; then
+           ewarn "boot/grub/core.img not found, not creating manifold boot ISO file"
+         else
+           log "Creating hybrid ISO file with manifold method"
+           einfo "Creating hybrid ISO file with manifold method"
+           echo 1 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh | cat - boot/grub/core.img | dd conv=notrunc of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc
+           eend $?
+         fi
+      fi
+
       # generate md5sum and sha1sum of ISO if we are using class 'RELEASE':
       case $CLASSES in *RELEASE*)
          [ "$RC" = 0 ] && \

diff --git a/scripts/bootgrub.mksh b/scripts/bootgrub.mksh
new file mode 100644 (file)
index 0000000..6762b0b
--- /dev/null
+++ b/scripts/bootgrub.mksh
@@ -0,0 +1,171 @@
+#!/usr/bin/env mksh
+# $Id$
+# $miros: src/sys/arch/i386/stand/bootxx/mkbxinst.sh,v 1.15 2009/02/08 20:47:48 tg Exp $
+#-
+# Copyright (c) 2007, 2008, 2009
+#      Thorsten Glaser <tg@mirbsd.org>
+#
+# Provided that these terms and disclaimer and all copyright notices
+# are retained or reproduced in an accompanying document, permission
+# is granted to deal in this work without restriction, including un‐
+# limited rights to use, publicly perform, distribute, sell, modify,
+# merge, give away, or sublicence.
+#
+# This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to
+# the utmost extent permitted by applicable law, neither express nor
+# implied; without malicious intent or gross negligence. In no event
+# may a licensor, author or contributor be held liable for indirect,
+# direct, other damage, loss, or other issues arising in any way out
+# of dealing in the work, even if advised of the possibility of such
+# damage or existence of a defect, except proven that it results out
+# of said person’s immediate fault when using the work as intended.
+#-
+# Self-installing 32-bit x86 boot blocks for GNU GRUB2 on i386-pc
+# Reads a list of extents (firstblock lastblock) from standard input
+# and writes bootxx to standard output, which can subsequentially be
+# stored as partition boot record (or floppy boot sector) on disc.
+
+set -A thecode 0x66 0x31 0xC9 0xBB 0x00 0x30 0x8E 0xD3 0xBC 0xFC 0xFF 0x66 0x51 0x66 0x9D 0x8E 0xC1 0xBF 0x00 0x7C 0x57 0xB1 0x10 0xF3 0xA4 0x5E 0x8E 0xD9 0xBB 0x00 0x08 0x53 0x53 0x8E 0xC3 0xBF 0x00 0xFE 0xB5 0x02 0xF3 0xA4 0x1F 0x68 0x7D 0xFE 0xCB 0x30 0x41 0x41 0x37 0x20 0x4C 0x6F 0x61 0x64 0x69 0x6E 0x67 0x20 0x00 0x62 0x61 0x64 0x20 0x6D 0x61 0x67 0x69 0x63 0x20 0x65 0x72 0x72 0x6F 0x72 0x0D 0x0A 0x00 0xAB 0x02 0x00 0x12 0x00 0x00 0x80 0x50 0xFF 0xB4 0x0E 0xBB 0x07 0x00 0xCD 0x10 0xAC 0x08 0xC0 0x75 0xF4 0xC3 0xE8 0xF7 0xFF 0xB8 0x30 0xFF 0x87 0x06 0x56 0xFE 0x3D 0x30 0xFF 0x75 0x19 0x31 0xC0 0xCD 0x16 0xEA 0xF0 0xFF 0x00 0xF0 0xFB 0x88 0x16 0x55 0xFE 0xBE 0x2F 0xFE 0x80 0xFA 0x80 0x72 0xDB 0xE8 0xD2 0xFF 0x31 0xDB 0xBE 0x53 0xFF 0x0F 0xB6 0x2E 0x4F 0xFE 0xAC 0x0F 0xB6 0xC8 0xC0 0xE9 0x05 0x83 0xE0 0x1F 0x40 0x41 0x50 0xBF 0x10 0xFE 0xB8 0x10 0x00 0xAB 0xB0 0x01 0xAB 0x89 0xD8 0xAB 0x8C 0xC8 0xAB 0xF3 0xA4 0x31 0xC0 0xAB 0xAB 0xAB 0xAB 0x5F 0x55 0x56 0xBE 0x10 0xFE 0xFF 0x16 0x56 0xFE 0xBD 0x04 0x00 0x8A 0x16 0x55 0xFE 0x60 0xF9 0xCD 0x13 0x9C 0xB8 0x2E 0x0E 0xBB 0x07 0x00 0xCD 0x10 0x9D 0xFB 0x61 0x73 0x1C 0x4D 0x60 0x9C 0x31 0xC0 0xCD 0x13 0x9D 0xBE 0x46 0xFE 0x0F 0x84 0x77 0xFF 0xB8 0x30 0x0E 0x01 0xE8 0xBB 0x07 0x00 0xCD 0x10 0x61 0xEB 0xD2 0xB4 0x02 0x00 0xE7 0x89 0x5C 0x04 0x00 0xFC 0x72 0x14 0x66 0x83 0x44 0x08 0x01 0x66 0x83 0x54 0x0C 0x00 0x4F 0x75 0xAC 0x5E 0x5D 0x4D 0x0F 0x85 0x7D 0xFF 0xBE 0x4C 0xFE 0xE8 0x3F 0xFF 0x66 0x31 0xD2 0x52 0x66 0x4A 0x8A 0x16 0x55 0xFE 0xB8 0x00 0x82 0x50 0xFA 0xCB 0x8B 0x44 0x08 0x8B 0x54 0x0A 0xF7 0x36 0x52 0xFE 0x42 0x31 0xC9 0x87 0xD1 0xF7 0x36 0x50 0xFE 0xC0 0xE4 0x06 0x86 0xC4 0x09 0xC1 0x88 0xD6 0xB8 0x01 0x02 0xC3 0xB4 0x42 0xC3
+typeset -i ofs_bkcnt=79
+typeset -i ofs_geomh=80
+typeset -i ofs_geoms=82
+typeset -i ofs_partp=84
+typeset -i ofs_secsz=252
+typeset -i begptr=339
+typeset -Uui8 thecode
+
+typeset -Uui16 curptr=begptr
+typeset -i wnum=0 wofs=0 wrec=0
+
+function do_record {
+       typeset -i blk=$1 cnt=$2 n
+       typeset -Uui16 x=blk y
+
+       (( blk && cnt )) || return
+
+       print -u2 "$wrec @0x${curptr#16#}: $cnt @$blk (0x${x#16#})"
+
+       while (( cnt )); do
+               let wrec++
+               (( n = blk < 0x00000100 ? 0 :
+                   blk < 0x00010000 ? 1 :
+                   blk < 0x01000000 ? 2 : 3 ))
+               (( x = cnt < 33 ? cnt : 32 ))
+               (( y = blk ))
+               print -u2 " - 0x${curptr#16#}: $((x)) (0x${x#16#}) @ $blk" \
+                   "(0x${y#16#})"
+               (( thecode[curptr++] = (n++ << 5) | (x - 1) ))
+               (( blk += x ))
+               (( cnt -= x ))
+               while (( n-- )); do
+                       (( thecode[curptr++] = y & 0xFF ))
+                       (( y >>= 8 ))
+               done
+       done
+}
+
+function record_block {
+       typeset -i sv blk=$1
+
+       if (( !blk || (wofs && blk != (wofs + wnum)) )); then
+               # flush the blocks from the cache
+               (( wnum )) && do_record $wofs $wnum
+               wofs=0
+               wnum=0
+       fi
+       if (( blk )); then
+               # record some new block into the cache
+               (( wofs )) || let wofs=blk
+               (( wnum += 1 << sscale ))
+       fi
+}
+
+typeset -i partp=0 numheads=0 numsecs=0 sscale=0 bsh=9
+
+while getopts ":0:1B:h:p:S:s:" ch; do
+       case $ch {
+       (0)     ;;
+       (1)     ;;
+       (B)     if (( (bsh = OPTARG) < 9 || OPTARG > 15 )); then
+                       print -u2 error: invalid block size "2^'$OPTARG'"
+                       exit 1
+               fi
+               ;;
+       (h)     if (( (numheads = OPTARG) < 1 || OPTARG > 256 )); then
+                       print -u2 warning: invalid head count "'$OPTARG'"
+                       numheads=0
+               fi ;;
+       (p)     if (( (partp = OPTARG) < 1 || OPTARG > 255 )); then
+                       print -u2 warning: invalid partition type "'$OPTARG'"
+                       partp=0
+               fi ;;
+       (S)     if (( (sscale = OPTARG) < 0 || OPTARG > 24 )); then
+                       print -u2 error: invalid input scale "'$OPTARG'"
+                       exit 1
+               fi ;;
+       (s)     if (( (numsecs = OPTARG) < 1 || OPTARG > 63 )); then
+                       print -u2 warning: invalid sector count "'$OPTARG'"
+                       numsecs=0
+               fi ;;
+       (*)     print -u2 'Syntax:
+       bxinst [-1] [-B blocksize] [-h heads] [-p partitiontype] [-S scale]
+           [-s sectors] <sectorlist | dd of=image conv=notrunc
+Default values: blocksize=9 heads=16 sectors=63 partitiontype=0x27 scale=0'
+               exit 1 ;;
+       }
+done
+shift $((OPTIND - 1))
+
+if (( !numheads )); then
+       print -u2 warning: using default value of 16 heads
+       numheads=16
+fi
+
+if (( !numsecs )); then
+       print -u2 warning: using default value of 63 sectors
+       numsecs=63
+fi
+
+# read in the extents
+while read firstblock lastblock junk; do
+       while (( firstblock <= lastblock )); do
+               record_block $((firstblock++ << sscale))
+       done
+done
+record_block 0 # just flush
+print -u2 "using $wrec blocks, $((curptr-begptr)) bytes ($((510-curptr)) free)"
+
+# fill the block table
+if (( curptr-- > 510 )); then
+       print -u2 error: too many blocks
+       exit 1
+fi
+while (( ++curptr < 510 )); do
+       (( thecode[curptr] = (curptr & 0xFCF) == 0x1C2 ? 0 : RANDOM & 0xFF ))
+       # ensure the “active” flag is never set to 0x00 or 0x80
+       if (( ((curptr + 2) & 0xFCF) == 0x01C0 )); then
+               (( thecode[curptr] & 0x7F )) || let --curptr
+       fi
+done
+thecode[510]=0x55
+thecode[511]=0xAA
+
+# fill in other data
+(( thecode[ofs_bkcnt] = wrec ))
+(( thecode[ofs_geomh] = numheads & 0xFF ))
+(( thecode[ofs_geomh + 1] = numheads >> 8 ))
+(( thecode[ofs_geoms] = numsecs ))
+(( thecode[ofs_partp] = partp ))
+print -u2 "using sectors of 2^$bsh = $((1 << bsh)) bytes"
+(( thecode[ofs_secsz] = (1 << (bsh - 8)) ))
+
+# create the output string
+ostr=
+curptr=0
+while (( curptr < 512 )); do
+       ostr=$ostr\\0${thecode[curptr++]#8#}
+done
+
+# over and out
+print -n "$ostr"
+exit 0

diff --git a/templates/boot/grub/_bsd.mod b/templates/boot/grub/_bsd.mod
new file mode 100644 (file)
index 0000000..5e2df1a
Binary files /dev/null and b/templates/boot/grub/_bsd.mod differ

diff --git a/templates/boot/grub/_chain.mod b/templates/boot/grub/_chain.mod
new file mode 100644 (file)
index 0000000..b8db3e9
Binary files /dev/null and b/templates/boot/grub/_chain.mod differ

diff --git a/templates/boot/grub/_linux.mod b/templates/boot/grub/_linux.mod
new file mode 100644 (file)
index 0000000..39beb5f
Binary files /dev/null and b/templates/boot/grub/_linux.mod differ

diff --git a/templates/boot/grub/_multiboot.mod b/templates/boot/grub/_multiboot.mod
new file mode 100644 (file)
index 0000000..c3f6ccb
Binary files /dev/null and b/templates/boot/grub/_multiboot.mod differ

diff --git a/templates/boot/grub/acorn.mod b/templates/boot/grub/acorn.mod
new file mode 100644 (file)
index 0000000..9aabdc0
Binary files /dev/null and b/templates/boot/grub/acorn.mod differ

diff --git a/templates/boot/grub/acpi.mod b/templates/boot/grub/acpi.mod
new file mode 100644 (file)
index 0000000..925cd28
Binary files /dev/null and b/templates/boot/grub/acpi.mod differ

diff --git a/templates/boot/grub/affs.mod b/templates/boot/grub/affs.mod
new file mode 100644 (file)
index 0000000..37c91e3
Binary files /dev/null and b/templates/boot/grub/affs.mod differ

diff --git a/templates/boot/grub/afs.mod b/templates/boot/grub/afs.mod
new file mode 100644 (file)
index 0000000..42998d2
Binary files /dev/null and b/templates/boot/grub/afs.mod differ

diff --git a/templates/boot/grub/amiga.mod b/templates/boot/grub/amiga.mod
new file mode 100644 (file)
index 0000000..ddc8021
Binary files /dev/null and b/templates/boot/grub/amiga.mod differ

diff --git a/templates/boot/grub/aout.mod b/templates/boot/grub/aout.mod
new file mode 100644 (file)
index 0000000..608aaad
Binary files /dev/null and b/templates/boot/grub/aout.mod differ

diff --git a/templates/boot/grub/apple.mod b/templates/boot/grub/apple.mod
new file mode 100644 (file)
index 0000000..d16b930
Binary files /dev/null and b/templates/boot/grub/apple.mod differ

diff --git a/templates/boot/grub/at_keyboard.mod b/templates/boot/grub/at_keyboard.mod
new file mode 100644 (file)
index 0000000..89599d2
Binary files /dev/null and b/templates/boot/grub/at_keyboard.mod differ

diff --git a/templates/boot/grub/ata.mod b/templates/boot/grub/ata.mod
new file mode 100644 (file)
index 0000000..0c8b0b6
Binary files /dev/null and b/templates/boot/grub/ata.mod differ

diff --git a/templates/boot/grub/ata_pthru.mod b/templates/boot/grub/ata_pthru.mod
new file mode 100644 (file)
index 0000000..eca6267
Binary files /dev/null and b/templates/boot/grub/ata_pthru.mod differ

diff --git a/templates/boot/grub/biosdisk.mod b/templates/boot/grub/biosdisk.mod
new file mode 100644 (file)
index 0000000..35f80e5
Binary files /dev/null and b/templates/boot/grub/biosdisk.mod differ

diff --git a/templates/boot/grub/bitmap.mod b/templates/boot/grub/bitmap.mod
new file mode 100644 (file)
index 0000000..31a0893
Binary files /dev/null and b/templates/boot/grub/bitmap.mod differ

diff --git a/templates/boot/grub/blocklist.mod b/templates/boot/grub/blocklist.mod
new file mode 100644 (file)
index 0000000..d1bd168
Binary files /dev/null and b/templates/boot/grub/blocklist.mod differ

diff --git a/templates/boot/grub/boot.mod b/templates/boot/grub/boot.mod
new file mode 100644 (file)
index 0000000..122791e
Binary files /dev/null and b/templates/boot/grub/boot.mod differ

diff --git a/templates/boot/grub/bsd.mod b/templates/boot/grub/bsd.mod
new file mode 100644 (file)
index 0000000..8c1d4b7
Binary files /dev/null and b/templates/boot/grub/bsd.mod differ

diff --git a/templates/boot/grub/bufio.mod b/templates/boot/grub/bufio.mod
new file mode 100644 (file)
index 0000000..27c3ac4
Binary files /dev/null and b/templates/boot/grub/bufio.mod differ

diff --git a/templates/boot/grub/cat.mod b/templates/boot/grub/cat.mod
new file mode 100644 (file)
index 0000000..bfaeb48
Binary files /dev/null and b/templates/boot/grub/cat.mod differ

diff --git a/templates/boot/grub/chain.mod b/templates/boot/grub/chain.mod
new file mode 100644 (file)
index 0000000..3e414b8
Binary files /dev/null and b/templates/boot/grub/chain.mod differ

diff --git a/templates/boot/grub/cmp.mod b/templates/boot/grub/cmp.mod
new file mode 100644 (file)
index 0000000..069d828
Binary files /dev/null and b/templates/boot/grub/cmp.mod differ

diff --git a/templates/boot/grub/command.lst b/templates/boot/grub/command.lst
new file mode 100644 (file)
index 0000000..a0c37b5
--- /dev/null
+++ b/templates/boot/grub/command.lst
@@ -0,0 +1,85 @@
+*acpi: acpi
+*cat: cat
+*drivemap: drivemap
+*echo: echo
+*efiemu_pnvram: efiemu
+*halt: halt
+*hdparm: hdparm
+*hello: hello
+*help: help
+*hexdump: hexdump
+*list_env: loadenv
+*load_env: loadenv
+*loopback: loopback
+*ls: ls
+*pxe: pxecmd
+*save_env: loadenv
+*search: search
+*serial: serial
+*sleep: sleep
+.: configfile
+[: test
+background_image: gfxterm
+badram: mmap
+blocklist: blocklist
+boot: boot
+cat: minicmd
+chainloader: chain
+cmp: cmp
+configfile: configfile
+cpuid: cpuid
+crc: crc
+date: date
+dump: minicmd
+efiemu_loadcore: efiemu
+efiemu_prepare: efiemu
+efiemu_unload: efiemu
+exit: minicmd
+freebsd: bsd
+freebsd_loadenv: bsd
+freebsd_module: bsd
+gptsync: gptsync
+handler: handler
+help: minicmd
+initrd32: linux
+initrd: linux16
+linux32: linux
+linux: linux16
+loadfont: font
+lsfonts: font
+lsmmap: lsmmap
+lsmod: minicmd
+lspci: lspci
+module: multiboot
+multiboot: multiboot
+netbsd: bsd
+openbsd: bsd
+parttool: parttool
+play: play
+read: read
+read_byte: memrw
+read_dword: memrw
+read_word: memrw
+reboot: reboot
+rmmod: minicmd
+root: minicmd
+source: configfile
+terminal_input: handler
+terminal_output: handler
+terminfo: terminfo
+test: test
+usb: usbtest
+vbeinfo: vbeinfo
+vbetest: vbetest
+videotest: videotest
+write_byte: memrw
+write_dword: memrw
+write_word: memrw
+xnu_devtree: xnu
+xnu_kernel: xnu
+xnu_kext: xnu
+xnu_kextdir: xnu
+xnu_mkext: xnu
+xnu_ramdisk: xnu
+xnu_resume: xnu
+xnu_splash: xnu

diff --git a/templates/boot/grub/configfile.mod b/templates/boot/grub/configfile.mod
new file mode 100644 (file)
index 0000000..7b5e44c
Binary files /dev/null and b/templates/boot/grub/configfile.mod differ

diff --git a/templates/boot/grub/core.img b/templates/boot/grub/core.img
new file mode 100644 (file)
index 0000000..3fad52c
Binary files /dev/null and b/templates/boot/grub/core.img differ

diff --git a/templates/boot/grub/cpio.mod b/templates/boot/grub/cpio.mod
new file mode 100644 (file)
index 0000000..a8d70ce
Binary files /dev/null and b/templates/boot/grub/cpio.mod differ

diff --git a/templates/boot/grub/cpuid.mod b/templates/boot/grub/cpuid.mod
new file mode 100644 (file)
index 0000000..3bee4ae
Binary files /dev/null and b/templates/boot/grub/cpuid.mod differ

diff --git a/templates/boot/grub/crc.mod b/templates/boot/grub/crc.mod
new file mode 100644 (file)
index 0000000..e66169b
Binary files /dev/null and b/templates/boot/grub/crc.mod differ

diff --git a/templates/boot/grub/date.mod b/templates/boot/grub/date.mod
new file mode 100644 (file)
index 0000000..2ae6d88
Binary files /dev/null and b/templates/boot/grub/date.mod differ

diff --git a/templates/boot/grub/datehook.mod b/templates/boot/grub/datehook.mod
new file mode 100644 (file)
index 0000000..1d56a5a
Binary files /dev/null and b/templates/boot/grub/datehook.mod differ

diff --git a/templates/boot/grub/datetime.mod b/templates/boot/grub/datetime.mod
new file mode 100644 (file)
index 0000000..f1298b0
Binary files /dev/null and b/templates/boot/grub/datetime.mod differ

diff --git a/templates/boot/grub/dm_nv.mod b/templates/boot/grub/dm_nv.mod
new file mode 100644 (file)
index 0000000..c62b6c3
Binary files /dev/null and b/templates/boot/grub/dm_nv.mod differ

diff --git a/templates/boot/grub/drivemap.mod b/templates/boot/grub/drivemap.mod
new file mode 100644 (file)
index 0000000..81c9091
Binary files /dev/null and b/templates/boot/grub/drivemap.mod differ

diff --git a/templates/boot/grub/echo.mod b/templates/boot/grub/echo.mod
new file mode 100644 (file)
index 0000000..d25adfb
Binary files /dev/null and b/templates/boot/grub/echo.mod differ

diff --git a/templates/boot/grub/efiemu.mod b/templates/boot/grub/efiemu.mod
new file mode 100644 (file)
index 0000000..e97ab56
Binary files /dev/null and b/templates/boot/grub/efiemu.mod differ

diff --git a/templates/boot/grub/efiemu32.o b/templates/boot/grub/efiemu32.o
new file mode 100644 (file)
index 0000000..ff89722
Binary files /dev/null and b/templates/boot/grub/efiemu32.o differ

diff --git a/templates/boot/grub/efiemu64.o b/templates/boot/grub/efiemu64.o
new file mode 100644 (file)
index 0000000..85f0466
Binary files /dev/null and b/templates/boot/grub/efiemu64.o differ

diff --git a/templates/boot/grub/elf.mod b/templates/boot/grub/elf.mod
new file mode 100644 (file)
index 0000000..2a7fbad
Binary files /dev/null and b/templates/boot/grub/elf.mod differ

diff --git a/templates/boot/grub/ext2.mod b/templates/boot/grub/ext2.mod
new file mode 100644 (file)
index 0000000..07470b1
Binary files /dev/null and b/templates/boot/grub/ext2.mod differ

diff --git a/templates/boot/grub/extcmd.mod b/templates/boot/grub/extcmd.mod
new file mode 100644 (file)
index 0000000..66d06fb
Binary files /dev/null and b/templates/boot/grub/extcmd.mod differ

diff --git a/templates/boot/grub/fat.mod b/templates/boot/grub/fat.mod
new file mode 100644 (file)
index 0000000..adcdaf4
Binary files /dev/null and b/templates/boot/grub/fat.mod differ

diff --git a/templates/boot/grub/font.mod b/templates/boot/grub/font.mod
new file mode 100644 (file)
index 0000000..fa1bd79
Binary files /dev/null and b/templates/boot/grub/font.mod differ

diff --git a/templates/boot/grub/fs.lst b/templates/boot/grub/fs.lst
new file mode 100644 (file)
index 0000000..a386d7d
--- /dev/null
+++ b/templates/boot/grub/fs.lst
@@ -0,0 +1,18 @@
+affs
+afs
+cpio
+ext2
+fat
+hfs
+hfsplus
+iso9660
+jfs
+minix
+ntfs
+pxe
+reiserfs
+sfs
+tar
+udf
+ufs
+xfs

diff --git a/templates/boot/grub/fs_uuid.mod b/templates/boot/grub/fs_uuid.mod
new file mode 100644 (file)
index 0000000..1593946
Binary files /dev/null and b/templates/boot/grub/fs_uuid.mod differ

diff --git a/templates/boot/grub/fshelp.mod b/templates/boot/grub/fshelp.mod
new file mode 100644 (file)
index 0000000..355e5ee
Binary files /dev/null and b/templates/boot/grub/fshelp.mod differ

diff --git a/templates/boot/grub/gfxterm.mod b/templates/boot/grub/gfxterm.mod
new file mode 100644 (file)
index 0000000..343c0c8
Binary files /dev/null and b/templates/boot/grub/gfxterm.mod differ

diff --git a/templates/boot/grub/gpt.mod b/templates/boot/grub/gpt.mod
new file mode 100644 (file)
index 0000000..5ede6b4
Binary files /dev/null and b/templates/boot/grub/gpt.mod differ

diff --git a/templates/boot/grub/gptsync.mod b/templates/boot/grub/gptsync.mod
new file mode 100644 (file)
index 0000000..a1eba5b
Binary files /dev/null and b/templates/boot/grub/gptsync.mod differ

diff --git a/templates/boot/grub/grml.png b/templates/boot/grub/grml.png
new file mode 100644 (file)
index 0000000..9506495
Binary files /dev/null and b/templates/boot/grub/grml.png differ

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
new file mode 100644 (file)
index 0000000..c713ba8
--- /dev/null
+++ b/templates/boot/grub/grub.cfg
@@ -0,0 +1,93 @@
+## grub2 configuration
+set default=0
+set timeout=5
+
+if font (hd0,1)/boot/grub/ascii.pff ; then
+   insmod png
+   set gfxmode=640x480
+   insmod gfxterm
+   insmod vbe
+   terminal gfxterm
+fi
+
+if background_image (hd0,1)/boot/grub/grml.png ; then
+  set color_normal=black/black
+  set color_highlight=red/black
+else
+  set menu_color_normal=white/black
+  set menu_color_highlight=black/yellow
+fi
+
+menuentry "%GRML_NAME% - release %VERSION% (default)" {
+    linux   /boot/%GRML_NAME%/linux26 apm=power-off vga=791 quiet boot=live nomce 
+    initrd  /boot/%GRML_NAME%/initrd.gz
+}
+
+menuentry "Memory test (memtest86+)" {
+    linux   /boot/addons/memtest
+}
+
+menuentry "Grub - all in one image" {
+    linux   /boot/addons/memdisk
+    initrd  /boot/addons/allinone.img
+}
+
+menuentry "FreeDOS" {
+    linux   /boot/addons/memdisk
+    initrd  /boot/addons/balder10.imz
+}
+
+menuentry "MirOS BSD" {
+    multiboot   /boot/addons/bsd4grml/ldbsd.com
+}
+
+menuentry "Boot OS of first partition on first disk" {
+    chainloader +1
+}
+
+menuentry "%GRML_NAME% - enable persistent mode" {
+    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet persistent 
+    initrd /boot/%GRML_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - copy grml to RAM" {
+    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram=%GRML_NAME%.squashfs 
+    initrd /boot/%GRML_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - copy whole medium to RAM" {
+    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet toram
+    initrd /boot/%GRML_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - start X by default" {
+    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 quiet startx=wm-ng 
+    initrd /boot/%GRML_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - disable framebuffer" {
+    linux  /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=ofonly 
+    initrd /boot/%GRML_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - forensic mode" {
+    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect 
+    initrd /boot/%GRML_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - failsafe mode" {
+    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal boot=live 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/%GRML_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - debug mode" {
+    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce vga=791 debug boot=live initcall_debug
+    initrd /boot/%GRML_NAME%/initrd.gz
+}
+
+menuentry "%GRML_NAME% - serial mode" {
+    linux /boot/%GRML_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    initrd /boot/%GRML_NAME%/initrd.gz
+}
+
+# EOF

diff --git a/templates/boot/grub/gzio.mod b/templates/boot/grub/gzio.mod
new file mode 100644 (file)
index 0000000..ba30a3a
Binary files /dev/null and b/templates/boot/grub/gzio.mod differ

diff --git a/templates/boot/grub/halt.mod b/templates/boot/grub/halt.mod
new file mode 100644 (file)
index 0000000..43e9730
Binary files /dev/null and b/templates/boot/grub/halt.mod differ

diff --git a/templates/boot/grub/handler.lst b/templates/boot/grub/handler.lst
new file mode 100644 (file)
index 0000000..4851541
--- /dev/null
+++ b/templates/boot/grub/handler.lst
@@ -0,0 +1,10 @@
+parser.lua: lua
+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

diff --git a/templates/boot/grub/handler.mod b/templates/boot/grub/handler.mod
new file mode 100644 (file)
index 0000000..1e232fa
Binary files /dev/null and b/templates/boot/grub/handler.mod differ

diff --git a/templates/boot/grub/hdparm.mod b/templates/boot/grub/hdparm.mod
new file mode 100644 (file)
index 0000000..84af7fc
Binary files /dev/null and b/templates/boot/grub/hdparm.mod differ

diff --git a/templates/boot/grub/hello.mod b/templates/boot/grub/hello.mod
new file mode 100644 (file)
index 0000000..50bcafd
Binary files /dev/null and b/templates/boot/grub/hello.mod differ

diff --git a/templates/boot/grub/help.mod b/templates/boot/grub/help.mod
new file mode 100644 (file)
index 0000000..2c7d59c
Binary files /dev/null and b/templates/boot/grub/help.mod differ

diff --git a/templates/boot/grub/hexdump.mod b/templates/boot/grub/hexdump.mod
new file mode 100644 (file)
index 0000000..bcae89e
Binary files /dev/null and b/templates/boot/grub/hexdump.mod differ

diff --git a/templates/boot/grub/hfs.mod b/templates/boot/grub/hfs.mod
new file mode 100644 (file)
index 0000000..891adbc
Binary files /dev/null and b/templates/boot/grub/hfs.mod differ

diff --git a/templates/boot/grub/hfsplus.mod b/templates/boot/grub/hfsplus.mod
new file mode 100644 (file)
index 0000000..1e7c5c0
Binary files /dev/null and b/templates/boot/grub/hfsplus.mod differ

diff --git a/templates/boot/grub/iso9660.mod b/templates/boot/grub/iso9660.mod
new file mode 100644 (file)
index 0000000..37a52b5
Binary files /dev/null and b/templates/boot/grub/iso9660.mod differ

diff --git a/templates/boot/grub/jfs.mod b/templates/boot/grub/jfs.mod
new file mode 100644 (file)
index 0000000..cd29a5d
Binary files /dev/null and b/templates/boot/grub/jfs.mod differ

diff --git a/templates/boot/grub/jpeg.mod b/templates/boot/grub/jpeg.mod
new file mode 100644 (file)
index 0000000..ffce464
Binary files /dev/null and b/templates/boot/grub/jpeg.mod differ

diff --git a/templates/boot/grub/linux.mod b/templates/boot/grub/linux.mod
new file mode 100644 (file)
index 0000000..11057d0
Binary files /dev/null and b/templates/boot/grub/linux.mod differ

diff --git a/templates/boot/grub/linux16.mod b/templates/boot/grub/linux16.mod
new file mode 100644 (file)
index 0000000..ad1abe5
Binary files /dev/null and b/templates/boot/grub/linux16.mod differ

diff --git a/templates/boot/grub/loadenv.mod b/templates/boot/grub/loadenv.mod
new file mode 100644 (file)
index 0000000..7b0defe
Binary files /dev/null and b/templates/boot/grub/loadenv.mod differ

diff --git a/templates/boot/grub/loopback.mod b/templates/boot/grub/loopback.mod
new file mode 100644 (file)
index 0000000..9a2ce27
Binary files /dev/null and b/templates/boot/grub/loopback.mod differ

diff --git a/templates/boot/grub/ls.mod b/templates/boot/grub/ls.mod
new file mode 100644 (file)
index 0000000..3185d67
Binary files /dev/null and b/templates/boot/grub/ls.mod differ

diff --git a/templates/boot/grub/lsmmap.mod b/templates/boot/grub/lsmmap.mod
new file mode 100644 (file)
index 0000000..619df6d
Binary files /dev/null and b/templates/boot/grub/lsmmap.mod differ

diff --git a/templates/boot/grub/lspci.mod b/templates/boot/grub/lspci.mod
new file mode 100644 (file)
index 0000000..fbb7acd
Binary files /dev/null and b/templates/boot/grub/lspci.mod differ

diff --git a/templates/boot/grub/lua.mod b/templates/boot/grub/lua.mod
new file mode 100644 (file)
index 0000000..1c716a6
Binary files /dev/null and b/templates/boot/grub/lua.mod differ

diff --git a/templates/boot/grub/lvm.mod b/templates/boot/grub/lvm.mod
new file mode 100644 (file)
index 0000000..e48091f
Binary files /dev/null and b/templates/boot/grub/lvm.mod differ

diff --git a/templates/boot/grub/mdraid.mod b/templates/boot/grub/mdraid.mod
new file mode 100644 (file)
index 0000000..192bcfb
Binary files /dev/null and b/templates/boot/grub/mdraid.mod differ

diff --git a/templates/boot/grub/memdisk.mod b/templates/boot/grub/memdisk.mod
new file mode 100644 (file)
index 0000000..239c480
Binary files /dev/null and b/templates/boot/grub/memdisk.mod differ

diff --git a/templates/boot/grub/memrw.mod b/templates/boot/grub/memrw.mod
new file mode 100644 (file)
index 0000000..4a03d64
Binary files /dev/null and b/templates/boot/grub/memrw.mod differ

diff --git a/templates/boot/grub/minicmd.mod b/templates/boot/grub/minicmd.mod
new file mode 100644 (file)
index 0000000..7e0dd7c
Binary files /dev/null and b/templates/boot/grub/minicmd.mod differ

diff --git a/templates/boot/grub/minix.mod b/templates/boot/grub/minix.mod
new file mode 100644 (file)
index 0000000..4e1e4df
Binary files /dev/null and b/templates/boot/grub/minix.mod differ

diff --git a/templates/boot/grub/mmap.mod b/templates/boot/grub/mmap.mod
new file mode 100644 (file)
index 0000000..7cfc6ed
Binary files /dev/null and b/templates/boot/grub/mmap.mod differ

diff --git a/templates/boot/grub/moddep.lst b/templates/boot/grub/moddep.lst
new file mode 100644 (file)
index 0000000..4700ec2
--- /dev/null
+++ b/templates/boot/grub/moddep.lst
@@ -0,0 +1,111 @@
+date: datetime normal
+pc:
+uhci: pci usb
+gpt:
+echo: extcmd
+apple:
+cpio:
+boot:
+gzio:
+ls: extcmd normal
+ufs:
+gfxterm: video bitmap font
+video:
+aout:
+pcpart: parttool
+extcmd:
+at_keyboard:
+minix:
+pxe: bufio
+help: extcmd
+usbms: usb scsi
+usbtest: usb
+reboot:
+blocklist:
+fs_uuid:
+fat:
+sh: normal
+parttool: normal
+linux: boot video mmap normal
+fshelp:
+usb_keyboard: usb
+ata: pci scsi
+amiga:
+dm_nv: raid
+reiserfs: fshelp
+datehook: datetime normal
+acorn:
+efiemu: extcmd acpi crc
+jpeg: bufio bitmap
+test:
+bsd: boot gzio aout elf mmap
+cmp: gzio
+memdisk:
+acpi: gzio extcmd mmap
+elf: gzio
+affs: fshelp
+xfs: fshelp
+cpuid:
+crc:
+usb:
+videotest: video font
+play:
+mdraid: raid
+pxecmd: extcmd pxe
+sleep: extcmd
+serial: extcmd terminfo
+sun:
+search: extcmd
+chain: boot
+lua: setjmp
+memrw:
+ata_pthru: ata
+configfile: normal
+linux16: boot mmap
+raid5rec: raid
+hello: extcmd
+vga_text:
+vbeinfo: vbe
+gptsync:
+ohci: pci usb
+bufio:
+hdparm: extcmd
+bitmap:
+terminfo:
+hfs:
+ntfscomp: ntfs
+biosdisk:
+lsmmap:
+mmap: boot
+png: bufio bitmap
+tar:
+hfsplus: fshelp
+lspci: pci
+tga: bufio bitmap
+scsi:
+lvm:
+raid:
+iso9660: fshelp
+raid6rec: raid
+udf: fshelp
+vbe: video
+handler:
+halt: extcmd
+read:
+multiboot: boot gzio elf mmap
+xnu: boot gzio video efiemu bitmap
+normal: boot
+loopback: extcmd
+sfs: fshelp
+jfs:
+vbetest: vbe
+cat: gzio
+afs: fshelp
+hexdump: gzio extcmd
+loadenv: extcmd
+minicmd:
+drivemap: boot extcmd mmap
+font: video bufio
+ext2: fshelp
+vga: font
+ntfs: fshelp

diff --git a/templates/boot/grub/multiboot.mod b/templates/boot/grub/multiboot.mod
new file mode 100644 (file)
index 0000000..34ea53e
Binary files /dev/null and b/templates/boot/grub/multiboot.mod differ

diff --git a/templates/boot/grub/normal.mod b/templates/boot/grub/normal.mod
new file mode 100644 (file)
index 0000000..bb70499
Binary files /dev/null and b/templates/boot/grub/normal.mod differ

diff --git a/templates/boot/grub/ntfs.mod b/templates/boot/grub/ntfs.mod
new file mode 100644 (file)
index 0000000..fea9b4a
Binary files /dev/null and b/templates/boot/grub/ntfs.mod differ

diff --git a/templates/boot/grub/ntfscomp.mod b/templates/boot/grub/ntfscomp.mod
new file mode 100644 (file)
index 0000000..fb242ac
Binary files /dev/null and b/templates/boot/grub/ntfscomp.mod differ

diff --git a/templates/boot/grub/ohci.mod b/templates/boot/grub/ohci.mod
new file mode 100644 (file)
index 0000000..287c4a2
Binary files /dev/null and b/templates/boot/grub/ohci.mod differ

diff --git a/templates/boot/grub/parttool.lst b/templates/boot/grub/parttool.lst
new file mode 100644 (file)
index 0000000..ac01681
--- /dev/null
+++ b/templates/boot/grub/parttool.lst
@@ -0,0 +1 @@
+pc_partition_map: pcpart

diff --git a/templates/boot/grub/parttool.mod b/templates/boot/grub/parttool.mod
new file mode 100644 (file)
index 0000000..ff1fde8
Binary files /dev/null and b/templates/boot/grub/parttool.mod differ

diff --git a/templates/boot/grub/pc.mod b/templates/boot/grub/pc.mod
new file mode 100644 (file)
index 0000000..a454e8b
Binary files /dev/null and b/templates/boot/grub/pc.mod differ

diff --git a/templates/boot/grub/pci.mod b/templates/boot/grub/pci.mod
new file mode 100644 (file)
index 0000000..59a744f
Binary files /dev/null and b/templates/boot/grub/pci.mod differ

diff --git a/templates/boot/grub/pcpart.mod b/templates/boot/grub/pcpart.mod
new file mode 100644 (file)
index 0000000..21ea8ef
Binary files /dev/null and b/templates/boot/grub/pcpart.mod differ

diff --git a/templates/boot/grub/play.mod b/templates/boot/grub/play.mod
new file mode 100644 (file)
index 0000000..27d8793
Binary files /dev/null and b/templates/boot/grub/play.mod differ

diff --git a/templates/boot/grub/png.mod b/templates/boot/grub/png.mod
new file mode 100644 (file)
index 0000000..58648d0
Binary files /dev/null and b/templates/boot/grub/png.mod differ

diff --git a/templates/boot/grub/pxe.mod b/templates/boot/grub/pxe.mod
new file mode 100644 (file)
index 0000000..c04b03a
Binary files /dev/null and b/templates/boot/grub/pxe.mod differ

diff --git a/templates/boot/grub/pxecmd.mod b/templates/boot/grub/pxecmd.mod
new file mode 100644 (file)
index 0000000..f3b9ce2
Binary files /dev/null and b/templates/boot/grub/pxecmd.mod differ

diff --git a/templates/boot/grub/raid.mod b/templates/boot/grub/raid.mod
new file mode 100644 (file)
index 0000000..fb3f9aa
Binary files /dev/null and b/templates/boot/grub/raid.mod differ

diff --git a/templates/boot/grub/raid5rec.mod b/templates/boot/grub/raid5rec.mod
new file mode 100644 (file)
index 0000000..e8fc434
Binary files /dev/null and b/templates/boot/grub/raid5rec.mod differ

diff --git a/templates/boot/grub/raid6rec.mod b/templates/boot/grub/raid6rec.mod
new file mode 100644 (file)
index 0000000..272702d
Binary files /dev/null and b/templates/boot/grub/raid6rec.mod differ

diff --git a/templates/boot/grub/read.mod b/templates/boot/grub/read.mod
new file mode 100644 (file)
index 0000000..2703131
Binary files /dev/null and b/templates/boot/grub/read.mod differ

diff --git a/templates/boot/grub/reboot.mod b/templates/boot/grub/reboot.mod
new file mode 100644 (file)
index 0000000..1bf8f87
Binary files /dev/null and b/templates/boot/grub/reboot.mod differ

diff --git a/templates/boot/grub/reiserfs.mod b/templates/boot/grub/reiserfs.mod
new file mode 100644 (file)
index 0000000..c8131b6
Binary files /dev/null and b/templates/boot/grub/reiserfs.mod differ

diff --git a/templates/boot/grub/scsi.mod b/templates/boot/grub/scsi.mod
new file mode 100644 (file)
index 0000000..b87b620
Binary files /dev/null and b/templates/boot/grub/scsi.mod differ

diff --git a/templates/boot/grub/search.mod b/templates/boot/grub/search.mod
new file mode 100644 (file)
index 0000000..808b3f1
Binary files /dev/null and b/templates/boot/grub/search.mod differ

diff --git a/templates/boot/grub/serial.mod b/templates/boot/grub/serial.mod
new file mode 100644 (file)
index 0000000..195065b
Binary files /dev/null and b/templates/boot/grub/serial.mod differ

diff --git a/templates/boot/grub/setjmp.mod b/templates/boot/grub/setjmp.mod
new file mode 100644 (file)
index 0000000..718bb3c
Binary files /dev/null and b/templates/boot/grub/setjmp.mod differ

diff --git a/templates/boot/grub/sfs.mod b/templates/boot/grub/sfs.mod
new file mode 100644 (file)
index 0000000..173acb6
Binary files /dev/null and b/templates/boot/grub/sfs.mod differ

diff --git a/templates/boot/grub/sh.mod b/templates/boot/grub/sh.mod
new file mode 100644 (file)
index 0000000..bb2ca99
Binary files /dev/null and b/templates/boot/grub/sh.mod differ

diff --git a/templates/boot/grub/sleep.mod b/templates/boot/grub/sleep.mod
new file mode 100644 (file)
index 0000000..ec5a9e6
Binary files /dev/null and b/templates/boot/grub/sleep.mod differ

diff --git a/templates/boot/grub/sun.mod b/templates/boot/grub/sun.mod
new file mode 100644 (file)
index 0000000..c289b0b
Binary files /dev/null and b/templates/boot/grub/sun.mod differ

diff --git a/templates/boot/grub/tar.mod b/templates/boot/grub/tar.mod
new file mode 100644 (file)
index 0000000..afd719d
Binary files /dev/null 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 (file)
index 0000000..cfdd7e4
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
new file mode 100644 (file)
index 0000000..00a66aa
Binary files /dev/null and b/templates/boot/grub/terminfo.mod differ

diff --git a/templates/boot/grub/test.mod b/templates/boot/grub/test.mod
new file mode 100644 (file)
index 0000000..c2b8555
Binary files /dev/null and b/templates/boot/grub/test.mod differ

diff --git a/templates/boot/grub/tga.mod b/templates/boot/grub/tga.mod
new file mode 100644 (file)
index 0000000..884fd36
Binary files /dev/null and b/templates/boot/grub/tga.mod differ

diff --git a/templates/boot/grub/udf.mod b/templates/boot/grub/udf.mod
new file mode 100644 (file)
index 0000000..055465e
Binary files /dev/null and b/templates/boot/grub/udf.mod differ

diff --git a/templates/boot/grub/ufs.mod b/templates/boot/grub/ufs.mod
new file mode 100644 (file)
index 0000000..3fdb793
Binary files /dev/null and b/templates/boot/grub/ufs.mod differ

diff --git a/templates/boot/grub/uhci.mod b/templates/boot/grub/uhci.mod
new file mode 100644 (file)
index 0000000..d241ed7
Binary files /dev/null and b/templates/boot/grub/uhci.mod differ

diff --git a/templates/boot/grub/usb.mod b/templates/boot/grub/usb.mod
new file mode 100644 (file)
index 0000000..2aa32f0
Binary files /dev/null and b/templates/boot/grub/usb.mod differ

diff --git a/templates/boot/grub/usb_keyboard.mod b/templates/boot/grub/usb_keyboard.mod
new file mode 100644 (file)
index 0000000..af23044
Binary files /dev/null and b/templates/boot/grub/usb_keyboard.mod differ

diff --git a/templates/boot/grub/usbms.mod b/templates/boot/grub/usbms.mod
new file mode 100644 (file)
index 0000000..171a3b2
Binary files /dev/null and b/templates/boot/grub/usbms.mod differ

diff --git a/templates/boot/grub/usbtest.mod b/templates/boot/grub/usbtest.mod
new file mode 100644 (file)
index 0000000..6f23062
Binary files /dev/null and b/templates/boot/grub/usbtest.mod differ

diff --git a/templates/boot/grub/vbe.mod b/templates/boot/grub/vbe.mod
new file mode 100644 (file)
index 0000000..de5cabd
Binary files /dev/null and b/templates/boot/grub/vbe.mod differ

diff --git a/templates/boot/grub/vbeinfo.mod b/templates/boot/grub/vbeinfo.mod
new file mode 100644 (file)
index 0000000..988fcec
Binary files /dev/null and b/templates/boot/grub/vbeinfo.mod differ

diff --git a/templates/boot/grub/vbetest.mod b/templates/boot/grub/vbetest.mod
new file mode 100644 (file)
index 0000000..dc3569c
Binary files /dev/null and b/templates/boot/grub/vbetest.mod differ

diff --git a/templates/boot/grub/vga.mod b/templates/boot/grub/vga.mod
new file mode 100644 (file)
index 0000000..e61c5f5
Binary files /dev/null and b/templates/boot/grub/vga.mod differ

diff --git a/templates/boot/grub/vga_text.mod b/templates/boot/grub/vga_text.mod
new file mode 100644 (file)
index 0000000..4def3a4
Binary files /dev/null and b/templates/boot/grub/vga_text.mod differ

diff --git a/templates/boot/grub/video.mod b/templates/boot/grub/video.mod
new file mode 100644 (file)
index 0000000..f9ae7f8
Binary files /dev/null and b/templates/boot/grub/video.mod differ

diff --git a/templates/boot/grub/videotest.mod b/templates/boot/grub/videotest.mod
new file mode 100644 (file)
index 0000000..d35c1be
Binary files /dev/null and b/templates/boot/grub/videotest.mod differ

diff --git a/templates/boot/grub/xfs.mod b/templates/boot/grub/xfs.mod
new file mode 100644 (file)
index 0000000..d7c411f
Binary files /dev/null and b/templates/boot/grub/xfs.mod differ

diff --git a/templates/boot/grub/xnu.mod b/templates/boot/grub/xnu.mod
new file mode 100644 (file)
index 0000000..6e64a0d
Binary files /dev/null and b/templates/boot/grub/xnu.mod differ