Lintian cleanups and release new version 0.9.39.

diff --git a/debian/NEWS b/debian/NEWS
index a268155..43f9a58 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,86 +1,86 @@
 grml-live (0.9.35) unstable; urgency=low
 
-  * The files from /etc/grml/fai/files have been moved to
-    /etc/grml/fai/config/files (and as a consequence
-    /etc/grml/fai/live-initramfs has been moved to
-    /etc/grml/fai/config/ as well). This is an important step
-    to use the config space and class concept of FAI in a more
-    decent and clean way. It allows much better customization. 
-    
-    Please notice: If you didn't modify anything inside
-    /etc/grml/fai/files you can safely remove the directory.
-    Otherwise please check out the structure of the new
-    /etc/grml/fai/config/files layout and the fcopy command
-    used in /etc/grml/fai/config/scripts/GRMLBASE/* scripts to
-    incoorporate your changes.
+  The files from /etc/grml/fai/files have been moved to
+  /etc/grml/fai/config/files (and as a consequence
+  /etc/grml/fai/live-initramfs has been moved to
+  /etc/grml/fai/config/ as well). This is an important step
+  to use the config space and class concept of FAI in a more
+  decent and clean way. It allows much better customization. 
+  
+  Please notice: If you didn't modify anything inside
+  /etc/grml/fai/files you can safely remove the directory.
+  Otherwise please check out the structure of the new
+  /etc/grml/fai/config/files layout and the fcopy command
+  used in /etc/grml/fai/config/scripts/GRMLBASE/* scripts to
+  incoorporate your changes.
 
  -- Michael Prokop <mika@grml.org>  Sat, 13 Feb 2010 01:35:43 +0100
 
 grml-live (0.9.34) unstable; urgency=low
 
-  * This version introduces an additional package named grml-live-db.
-    The grml-live-db Debian package provides a simple way to put build
-    information of grml-live into a database. By default you have to do
-    nothing but install grml-live-db and during each invocation of
-    grml-live you'll get an additional entry in the sqlite3 database
-    /var/log/grml-live.db. If you want to customize the database logging
-    check out the grml-live-db manpage.
-
-  * Instead of ZERO_LOGFILE a new variable titled PRESERVE_LOGFILE has
-    been introduced. By default grml-live cleans the build logfile so
-    grml-live-db can work straight out-of-the-box. If you still want to
-    preserve your logfiles (e.g. when you don't want to use
-    grml-live-db) just enable the PRESERVE_LOGFILE option in your
-    grml-live configuration file.  For backwards compatibility reasons the
-    ZERO_LOGFILE variable is still supported within grml-live but it's
-    strongly recommended to adjust configuration.
+  This version introduces an additional package named grml-live-db.
+  The grml-live-db Debian package provides a simple way to put build
+  information of grml-live into a database. By default you have to do
+  nothing but install grml-live-db and during each invocation of
+  grml-live you'll get an additional entry in the sqlite3 database
+  /var/log/grml-live.db. If you want to customize the database logging
+  check out the grml-live-db manpage.
+
+  Instead of ZERO_LOGFILE a new variable titled PRESERVE_LOGFILE has
+  been introduced. By default grml-live cleans the build logfile so
+  grml-live-db can work straight out-of-the-box. If you still want to
+  preserve your logfiles (e.g. when you don't want to use
+  grml-live-db) just enable the PRESERVE_LOGFILE option in your
+  grml-live configuration file.  For backwards compatibility reasons the
+  ZERO_LOGFILE variable is still supported within grml-live but it's
+  strongly recommended to adjust configuration.
 
  -- Michael Prokop <mika@grml.org>  Sat, 30 Jan 2010 14:36:15 +0100
 
 grml-live (0.9.4) unstable; urgency=low
 
-  * grml provides its own squashfs-tools again which support LZMA
-    compression with kernel 2.6.26-grml[64], please install the
-    Debian package squashfs-lzma-tools of the grml repository.
-    More details can be found in the grml-live docs. Please
-    check out the section "Current state of grml-live with
-    squashfs-tools and kernel" in the grml-live docs, being
-    shipped with this package as manpage grml-live(8) and
-    /usr/share/doc/grml-live/grml-live.html and being available
-    online at http://grml.org/grml-live/#current_state as well.
-
-  * grml migrated from Mercurial (hg) to Git as version control
-    system. If you are interested in using very recent grml-live
-    versions from our VCS please make sure to check out the docs.
-    http://git.grml.org/?p=grml-live.git
+  grml provides its own squashfs-tools again which support LZMA
+  compression with kernel 2.6.26-grml[64], please install the
+  Debian package squashfs-lzma-tools of the grml repository.
+  More details can be found in the grml-live docs. Please
+  check out the section "Current state of grml-live with
+  squashfs-tools and kernel" in the grml-live docs, being
+  shipped with this package as manpage grml-live(8) and
+  /usr/share/doc/grml-live/grml-live.html and being available
+  online at http://grml.org/grml-live/#current_state as well.
+
+  grml migrated from Mercurial (hg) to Git as version control
+  system. If you are interested in using very recent grml-live
+  versions from our VCS please make sure to check out the docs.
+  http://git.grml.org/?p=grml-live.git
 
  -- Michael Prokop <mika@grml.org>  Tue, 30 Sep 2008 13:12:07 +0200
 
 grml-live (0.9) unstable; urgency=low
 
-  * grml-live 0.9 features kernel 2.6.26-grml[64]. Using
-    squashfs-tools 1:3.2r2-9exp1 does not work with kernel
-    2.6.26-grml when using LZMA compression though it works
-    fine when using ZLIB compression.
+  grml-live 0.9 features kernel 2.6.26-grml[64]. Using
+  squashfs-tools 1:3.2r2-9exp1 does not work with kernel
+  2.6.26-grml when using LZMA compression though it works
+  fine when using ZLIB compression.
 
-    Debian provides updated squashfs-tools 1:3.3-7. You can
-    safely upgrade as long as you don't need kernel
-    2.6.23-grml[64] and/or LZMA compression.
+  Debian provides updated squashfs-tools 1:3.3-7. You can
+  safely upgrade as long as you don't need kernel
+  2.6.23-grml[64] and/or LZMA compression.
 
-    All these details can be found in the grml-live docs. Please
-    check out the section "Current state of grml-live with
-    squashfs-tools and kernel" in the grml-live docs, being
-    shipped with this package as manpage grml-live(8) and
-    /usr/share/doc/grml-live/grml-live.html and being available
-    online at http://grml.org/grml-live/#current_state as well.
+  All these details can be found in the grml-live docs. Please
+  check out the section "Current state of grml-live with
+  squashfs-tools and kernel" in the grml-live docs, being
+  shipped with this package as manpage grml-live(8) and
+  /usr/share/doc/grml-live/grml-live.html and being available
+  online at http://grml.org/grml-live/#current_state as well.
 
  -- Michael Prokop <mika@grml.org>  Fri, 22 Aug 2008 08:32:44 +0200
 
 grml-live (0.0.4) unstable; urgency=low
 
-  * The -t option for specifying the output directory has been
-    renamed into -o. The option -t now specifies the place where
-    templates for building the ISO can be found.
-    Do not forget to adjust present scripts you use with grml-live.
+  The -t option for specifying the output directory has been
+  renamed into -o. The option -t now specifies the place where
+  templates for building the ISO can be found.
+  Do not forget to adjust present scripts you use with grml-live.
 
  -- Michael Prokop <mika@grml.org>  Sat, 06 Oct 2007 16:50:16 +0200

diff --git a/debian/changelog b/debian/changelog
index b7015c2..fa61170 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+grml-live (0.9.39) unstable; urgency=low
+
+  * Add support for /boot/isolinux/submenu*.cfg files.
+  * Drop bootfrom=removable from default bootoptions (we've bootid
+    and scan removable devices first nowadays).
+  * Grub2 related changes:
+    - Add scripts/create-grub-dir.sh to build templates/boot/grub/
+    - Add font file templates/boot/grub/ascii.pf2
+    - Update templates/boot/grub/ based on grub-pc_1.98-1_i386.deb
+    - grub.cfg:
+      ~ add additional menu_color_* entries if loading background image
+      ~ loadfont /boot/grub/ascii.pf2
+      ~ increase timeout to 20 seconds
+      ~ replace terminal command with terminal_output
+      ~ use gfxpayload=1024x768 instead of vga=...
+  * Some minor lintian cleanups. 
+  * Software related changes:
+    - Add mksh to GRML_SMALL and GRML_MEDIUM to allow switching to mksh for
+      `minimal-shell'.
+    - Add numactl to GRML_FULL (thanks, gebi).
+    - Drop ctapi-cyberjack.
+    - Drop sl-modem-daemon.
+    - Update to grml kernel 2.6.33.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 11 Mar 2010 15:12:21 +0100
+
 grml-live (0.9.38) unstable; urgency=low
 
   * Move ia32-libs from Depends to Recommends so installation

diff --git a/debian/overrides.grml-live b/debian/overrides.grml-live
index 254a2f9..f3ef849 100644 (file)
--- a/debian/overrides.grml-live
+++ b/debian/overrides.grml-live
@@ -11,17 +11,20 @@ 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/befs.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/bitmap_scale.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/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/charset.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/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
@@ -32,6 +35,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/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/example_functional_test.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
@@ -39,11 +43,34 @@ 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/fs_file.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/functional_test.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_arcfour.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_blowfish.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_camellia.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_cast5.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_crc.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_des.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_md4.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_md5.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_rfc2268.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_rijndael.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_rmd160.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_seed.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_serpent.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_sha1.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_sha256.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_sha512.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_tiger.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_twofish.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_whirlpool.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gettext.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gfxmenu.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/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/hashsum.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
@@ -69,6 +96,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/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/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/normal.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
@@ -82,6 +110,8 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_sun.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
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/pbkdf2.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/play.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/png.mod
@@ -94,17 +124,24 @@ 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/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/relocator.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_fs_file.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/search_fs_uuid.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/search_label.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/setpci.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/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/trig.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/true.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/ufs1.mod
@@ -140,17 +177,20 @@ 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/befs.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/bitmap_scale.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/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/charset.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/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
@@ -161,6 +201,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/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/example_functional_test.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
@@ -168,11 +209,34 @@ 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/fs_file.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/functional_test.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_arcfour.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_blowfish.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_camellia.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_cast5.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_crc.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_des.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_md4.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_md5.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_rfc2268.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_rijndael.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_rmd160.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_seed.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_serpent.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_sha1.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_sha256.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_sha512.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_tiger.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_twofish.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_whirlpool.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gettext.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gfxmenu.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/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/hashsum.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
@@ -198,6 +262,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/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/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/normal.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
@@ -211,6 +276,8 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sun.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
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/pbkdf2.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/play.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/png.mod
@@ -223,17 +290,24 @@ 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/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/relocator.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_fs_file.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/search_fs_uuid.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/search_label.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/setpci.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/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/trig.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/true.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/ufs1.mod
@@ -276,17 +350,20 @@ 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/befs.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/bitmap_scale.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/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/charset.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/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
@@ -295,6 +372,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/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/example_functional_test.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
@@ -302,11 +380,34 @@ 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/fs_file.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/functional_test.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_arcfour.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_blowfish.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_camellia.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_cast5.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_crc.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_des.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_md4.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_md5.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_rfc2268.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_rijndael.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_rmd160.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_seed.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_serpent.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_sha1.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_sha256.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_sha512.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_tiger.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_twofish.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_whirlpool.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gettext.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gfxmenu.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/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/hashsum.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
@@ -332,6 +433,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/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/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/normal.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
@@ -345,6 +447,8 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sun.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
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/pbkdf2.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/play.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/png.mod
@@ -357,17 +461,24 @@ 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/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/relocator.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_fs_file.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/search_fs_uuid.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/search_label.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/setpci.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/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/trig.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/true.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/ufs1.mod

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 33a8267..aafd340 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -347,7 +347,7 @@ configuration instead.
   /etc/grml/grml-live.local
 
 All the local configuration should go to this file. This file overrides any
-defaults of grml-live. Configurations via /etc/grml/grml-live.local are prefered
+defaults of grml-live. Configurations via /etc/grml/grml-live.local are preferred
 over the ones from /etc/grml/grml-live.conf. If you want to override settings
 from /etc/grml/grml-live.local as well you have to specify them on the grml-live
 commandline.
@@ -834,7 +834,7 @@ taken. If you customise the variables in /etc/grml/grml-live.conf then the two
 files will be adjusted during runtime automatically.
 
 If MIRROR_DIRECTORY and MIRROR_SOURCES are specified the local mirror will be
-taken as first entry in the generated sources.list so it's prefered over
+taken as first entry in the generated sources.list so it's preferred over
 non-local mirrors. Using a fallback mirror (via providing several mirrors in
 GRML_LIVE_SOURCES as used by default) is a recommended setting.
 

diff --git a/grml-live b/grml-live
index 9894e95..c0be180 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -23,7 +23,7 @@ fi
 set -e
 
 # global variables
-GRML_LIVE_VERSION='0.9.38'
+GRML_LIVE_VERSION='0.9.39'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list'