Merge pull request #417 from grml/zeha/cleanup

Drop bullseye support

Author: zeha

config/bootstrap-keyring/DEBIAN_BULLSEYE

@@ -65,7 +65,6 @@ grml persistence                      Enable persistency feature, more details a
                                       http://wiki.grml.org/doku.php?id=persistency
 grml hostname=...                     Set hostname to given argument
 grml hostname                         Set a random hostname
-                                      [Note: only available with releases newer than 2010.04]
 grml nonetworking                     Do not create/overwrite /etc/network/interface during startup
 grml distri=...                       Set distribution name to given argument. If a jpg file named like the
                                       given distri name can be found in directory desktop on the ISO
@@ -129,25 +128,22 @@ grml isofrom=[fs:][/device]/grml.iso  Use specified ISO image for booting.
                                       NOTE: you can can also use isofrom=/dev/disk/by-label/yourlabel
                                       (adjust yourlabel as needed), which should prevent choosing the
                                       wrong block device (e.g. if more than one disk is present).
-grml findiso=/grml_2010.12.iso        Look for the specified ISO file on all disks where it usually
+grml findiso=/grml-....iso            Look for the specified ISO file on all disks where it usually
                                       looks for the .squashfs file (so you don't have to know the device name
                                       as in isofrom=....).
 grml fetch=$IP/filename.squashfs      Download a squashfs image from a given url, copying to ram and booting it.
-                                      [Note: releases before 2011.05 didn't support DNS but IP only.]
 grml live-media-path=/live/grml...    Sets the path to the live filesystem on the medium
                                       By default, it is set to /live/$GRML_FLAVOUR/ (where $GRML_FLAVOUR
                                       is corresponding to grml64-full, grml32-full, grml64-small,...
-                                      [Note: this option is mandatory since release 2011.12]
+                                      [Note: this parameter is mandatory]
 grml module=grml                      Instead of using the default "$name.module" another file can
                                       be specified without the extension ".module"; it should be placed
                                       on "/live" directory of the live medium
                                       Useful for Multiboot USB pen, see
                                       http://wiki.grml.org/doku.php?id=tips#multiboot_usb_pen
 grml bootid=mybootid                  Use specified argument as identifier for the ISO.
                                       mybootid is specified in /conf/bootid.txt on the ISO.
-                                      [Note: only available since release 2010.04]
 grml ignore_bootid                    Disable bootid verification.
-                                      [Note: only available since release 2010.04]
 
 
 Debugging related settings:

config/files/DEBIAN_BULLSEYE/etc/apt/sources.list.d/debian.sources

@@ -39,12 +39,5 @@ elif ifclass I386 ; then
   grml-live-copy-file-logged "${media_dir}"/boot/addons/memtest "${target}" /boot/memtest86+ia32.bin || true
 fi
 
-# fallback: if we still don't have /boot/addons/memtest available, we
-# might have an older memtest86+ version (<=5.01-3.1) which ships
-# file "memtest86+.bin" instead
-if ! [ -r "${media_dir}/boot/addons/memtest" ] ; then
-  grml-live-copy-file-logged "${media_dir}"/boot/addons/memtest "${target}" /boot/memtest86+.bin || true
-fi
-
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2