From c057283fb0e5e2b4e9f5f6b4293602be72de0eb8 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 24 Jun 2015 10:21:50 +0200
Subject: [PATCH] Drop unmaintained GRML_MEDIUM + GRML_XL classes

While at it update the ISO size docs for grml-full and grml-small
to match latest release.
---
 docs/grml-live.txt                             |   12 +-
 etc/grml/fai/config/package_config/GRML_MEDIUM |  185 ---
 etc/grml/fai/config/package_config/GRML_XL     | 1473 ------------------------
 etc/grml/grml-live.conf                        |    4 +-
 4 files changed, 5 insertions(+), 1669 deletions(-)
 delete mode 100644 etc/grml/fai/config/package_config/GRML_MEDIUM
 delete mode 100644 etc/grml/fai/config/package_config/GRML_XL

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 3524115..111ff32 100644
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -285,7 +285,7 @@ The main and base class provided by grml-live is named GRMLBASE. It's strongly
 recommended to **always** use the class GRMLBASE when building an ISO using
 grml-live, as well as the architecture dependent class which provides the kernel
 (being 'I386' for x86_32 and 'AMD64' for x86_64) and a GRML_* class (like
-GRML_SMALL, GRML_MEDIUM or GRML_FULL). The following files and directories are
+GRML_SMALL or GRML_FULL). The following files and directories are
 relevant for class GRMLBASE by default:
 
   ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/
@@ -329,17 +329,11 @@ this class as well, so unless you have a really good reason you should always
 use this class.
 
 * GRML_FULL: full featured Grml, also known as the "normal", full grml as
-introduced in December 2011 (~350MB ISO size).
+introduced in December 2011 (~460MB ISO size).
 
-* GRML_MEDIUM: medium sized Grml version, used to be known as grml-medium
-until December 2011 (~220MB ISO size).
-
-* GRML_SMALL: minimum sized Grml version, known as grml-small (~110MB ISO
+* GRML_SMALL: minimum sized Grml version, known as grml-small (~230MB ISO
 size).
 
-* GRML_XL: large size Grml version, used to be known as "full grml" until
-December 2011 (~700MB ISO size).
-
 * LATEX: LaTeX(-related) packages like auctex, texlive,...
 (which used to be shipped by grml before the LaTeX removal)
 
diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
deleted file mode 100644
index 048ee26..0000000
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ /dev/null
@@ -1,185 +0,0 @@
-PACKAGES aptitude
-
-acpid
-acpi-support
-adduser
-agrep
-alsa-base
-alsa-utils
-apt
-atftp
-atftpd
-attr
-aumix
-bash
-beep
-bing
-binutils
-bridge-utils
-bsdmainutils
-bsdutils
-buffer
-chntpw
-coreutils
-cpio
-cryptsetup
-dante-client
-dash
-dctrl-tools
-debconf
-debconf-i18n
-debconf-utils
-debianutils
-debootstrap
-dialog
-diffutils
-dmraid
-dmsetup
-dns2tcp
-dosfstools
-dpkg
-dselect
-dstat
-e2fsprogs
-ed
-eterm
-ethtool
-findutils
-fluxbox
-fuse
-gddrescue
-genext2fs
-grml-debugtools
-grml-desktop
-grml-live
-grml-paste
-grml-quickconfig-standard
-grml-rescueboot
-grml-terminalserver
-grml-x
-grub-imageboot
-guessnet
-htop
-ifupdown
-imvirt
-inetutils-inetd
-iproute
-iptraf
-iptstate
-iputils-ping
-irqbalance
-isc-dhcp-client
-iw
-jed
-jed-common
-jfsutils
-kexec-tools
-keychain
-knockd
-latencytop
-libnss-myhostname
-lilo
-links
-links2
-localepurge
-locales
-lockfile-progs
-login
-logrotate
-lrzsz
-lsof
-mawk
-mbr
-mc
-memtester
-mksh
-most
-mount
-mpack
-mtools
-mtr-tiny
-multitail
-ncftp
-netbase
-netcat-openbsd
-net-tools
-nfs-kernel-server
-ntfs-3g
-ntpdate
-nvi
-parted
-partimage
-passwd
-patch
-pcmciautils
-postfix
-powertop
-ppp
-pppoeconf
-procinfo
-procps
-psmisc
-pump
-readline-common
-reiserfsprogs
-reptyr
-rpcbind
-rungetty
-screen
-scsitools
-sed
-ser2net
-setserial
-sharutils
-smartmontools
-socat
-sshfs
-statserial
-sudo
-symlinks
-sysvinit
-sysvinit-utils
-tar
-tcpd
-tcpdump
-telnet
-tofrodos
-tzdata
-ucf
-unp
-unzip
-update-inetd
-util-linux
-vim
-vlan
-wget
-whiptail
-wipe
-xcursor-themes
-xfonts-100dpi
-xfonts-75dpi
-xfonts-base
-xfsdump
-xfsprogs
-xosd-bin
-xserver-xorg
-xserver-xorg-core
-xserver-xorg-input-all
-xserver-xorg-video-all
-xterm
-zerofree
-zip
-zoo
-zsh
-
-# accessibility testing
-brltty
-espeakup
-
-PACKAGES aptitude I386
-linux-image-i386-grml
-#virtualbox-ose-guest-modules-3.1.0-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-
-PACKAGES aptitude AMD64
-linux-image-amd64-grml
-#virtualbox-ose-guest-modules-3.1.0-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
diff --git a/etc/grml/fai/config/package_config/GRML_XL b/etc/grml/fai/config/package_config/GRML_XL
deleted file mode 100644
index f5e1770..0000000
--- a/etc/grml/fai/config/package_config/GRML_XL
+++ /dev/null
@@ -1,1473 +0,0 @@
-PACKAGES aptitude
-
-## Known problems {{{
-
-# a2ps fails with:
-#Setting up a2ps (1:4.13c~rc5-1) ...
-#ERROR: emacsen-common being used before being configured.
-# [...] => #246296
-# ... but the package is usually being installed as a dependency later on
-
-# vifm fails with:
-#Setting up vifm (0.3-2) ...
-#dpkg: error processing vifm (--configure):
-# subprocess post-installation script returned error exit status 1
-
-## }}}
-
-## grml specific packages {{{
-grml-debugtools
-grml-desktop
-grml-live
-grml-paste
-grml-quickconfig-standard
-grml-terminalserver
-grml-x
-zsh-lovers
-## }}}
-
-## Official Debian packages {{{
-4g8
-9base
-9menu
-abcde
-abook
-acct
-ack-grep
-acl
-acpi
-acpid
-acpidump
-acpi-support
-acpitail
-acpitool
-adduser
-aespipe
-aewan
-afflib-tools
-aggregate
-aiccu
-ajaxterm
-alien
-alsa-base
-alsa-oss
-alsaplayer-alsa
-alsaplayer-common
-alsaplayer-gtk
-alsaplayer-oss
-alsa-utils
-amanda-client
-amanda-common
-anacron
-antiword
-aoetools
-aosd-cat
-apache2.2-common
-apache2-mpm-prefork
-apache2-utils
-apcupsd
-apcupsd-cgi
-apf-client
-apf-server
-apg
-apt
-apt-dpkg-ref
-apt-file
-aptitude
-aptsh
-apt-show-source
-apt-show-versions
-apt-spy
-apt-src
-apt-transport-https
-apt-utils
-apt-zip
-apwal
-ara
-argus-client
-arj
-arp-scan
-arptables
-arpwatch
-array-info
-ascii
-ascii2binary
-asciidoc
-asql
-asused
-at
-atftp
-atftpd
-athena-jot
-atop
-atsar
-attr
-aumix
-autoconf
-automake
-automake1.4
-automake1.7
-automake1.9
-autopsy
-autossh
-autotools-dev
-avahi-daemon
-aview
-away
-awesfx
-awesome
-axel
-backup2l
-backup-manager
-bacula-common
-bacula-console
-bacula-fd
-balance
-base-files
-base-passwd
-bash
-bash-builtins
-bash-doc
-bb
-bbe
-bc
-bchunk
-bcrelay
-bcrypt
-beep
-bfbtester
-biabam
-bin86
-binclock
-bind9-host
-binfmt-support
-bing
-binstats
-binutils
-bison
-bitlbee
-bittornado
-bittorrent
-bittwist
-bkhive
-blktrace
-bluez-hcidump
-bluez-utils
-bmon
-bonnie++
-bootchart
-boxes
-bridge-utils
-bsdgames
-bsdiff
-bsd-mailx
-bsdmainutils
-bsdtar
-bsdutils
-bti
-btrfs-tools
-btscanner
-buffer
-burn
-bvi
-bwm-ng
-cabextract
-caca-utils
-ca-certificates
-cadaver
-capiutils
-catdoc
-cbm
-ccache
-ccal
-cciss-vol-status
-ccze
-cdbackup
-cdbs
-cdck
-cd-discid
-cdebootstrap
-cdparanoia
-cdpr
-cdrdao
-cdrskin
-centerim-utf8
-cereal
-cfv
-cgdb
-chkrootkit
-chntpw
-chrootuid
-cifs-utils
-clamav
-clamav-base
-clamav-daemon
-clamav-freshclam
-clamav-testfiles
-clipit
-cloop-utils
-cmospwd
-cmus
-codeville
-comgt
-compartment
-concalc
-configure-debian
-conkeror
-connect-proxy
-conntrack
-conspy
-convmv
-coreutils
-corkscrew
-cowdancer
-cowsay
-cpio
-cpipe
-cplay
-cpp
-cpu
-cpuburn
-cpufrequtils
-cpuid
-cpulimit
-crack
-cracklib-runtime
-cramfsprogs
-crosshurd
-cryptcat
-cryptsetup
-cscope
-csh
-csync2
-ctorrent
-cu
-cuetools
-cups-bsd
-cups-client
-cups-pdf
-curl
-curlftpfs
-cvs
-cvs2cl
-cvsconnect
-cvsdelta
-daemon
-dante-client
-dar
-dares
-dares-qt
-dash
-davfs2
-dbs
-dbus
-dbus-x11
-dc
-dcfldd
-dconf
-dcraw
-dctrl-tools
-ddclient
-dds2tar
-debarchiver
-debconf
-debconf-i18n
-debconf-utils
-debdelta
-debhelper
-debian-archive-keyring
-debian-goodies
-debian-reference-common
-debian-reference-en
-debianutils
-debmirror
-debootstrap
-debsecan
-debsigs
-debsums
-detox
-devio
-devscripts
-devtodo
-dhcp3-server
-dhcpdump
-dhcping
-dh-kpatches
-dh-make
-dh-make-perl
-di
-diakonos
-dialog
-dict
-diction
-dictionaries-common
-dietlibc-dev
-diffstat
-diffutils
-ding
-dir2ogg
-dirdiff
-directvnc
-dirmngr
-dirvish
-disktype
-distmp3
-dlint
-dmraid
-dmsetup
-dns2tcp
-dnsmasq
-dnsproxy
-dnstracer
-dnsutils
-docbook
-docbook2odf
-docbook-dsssl
-docbook-to-man
-doscan
-dosfstools
-dov4l
-dpatch
-dpkg
-dpkg-awk
-dpkg-dev
-dpkg-repack
-dpkg-ruby
-dpkg-sig
-dput
-drbd8-utils
-drbdlinks
-driftnet
-dsbltesters
-dselect
-dsh
-dsniff
-dstat
-dtach
-dump
-duplicity
-dupload
-durep
-dvb-apps
-dvdbackup
-dvdisaster
-dvd+rw-tools
-dvtm
-dwdiff
-dzen2
-e2fsprogs
-e2tools
-e2undel
-ebtables
-ecryptfs-utils
-ed
-edbrowse
-electric-fence
-elinks
-elvis
-elvis-common
-emacs
-encfs
-enscribe
-enscript
-ent
-epdfview
-equivs
-etckeeper
-eterm
-etherwake
-ethstatus
-ethtool
-ewf-tools
-exifprobe
-exiftran
-exiv2
-expect
-ext3grep
-exuberant-ctags
-facter
-fai-client
-fai-doc
-fail2ban
-fai-server
-fai-setup-storage
-fake
-fakeroot
-faketime
-farpd
-fatattr
-fatresize
-fatsort
-fbcat
-fbi
-fbset
-fbterm
-fcrackzip
-fdupes
-febootstrap
-feh
-fetchmail
-findutils
-finger
-fio
-firehol
-fish
-flashrom
-flawfinder
-fl-cow
-flex
-flexbackup
-fluxbox
-fondu
-fontconfig
-fontconfig-config
-foremost
-fortune-mod
-fortunes-debian-hints
-fortunes-min
-fping
-fprobe
-fprobe-ulog
-freeglut3
-freeradius
-freeradius-ldap
-freesweep
-fsarchiver
-ftp
-ftpcopy
-ftp-upload
-ftpwatch
-funny-manpages
-fusedav
-fuseiso
-fuseiso9660
-fuse
-fwlogwatch
-fxload
-gaffitter
-gamin
-gatling
-gcal
-gcolor2
-gdb
-gddrescue
-gdisk
-geeqie
-gems
-genders
-genext2fs
-getmail4
-gettext
-gftp-common
-gftp-text
-ghostscript
-giblib1
-git
-git-email
-gitk
-gitpkg
-git-svn
-gitweb
-gkermit
-gkrellm
-gkrellmd
-gkrellmitime
-gkrellm-reminder
-gkrellm-volume
-gkrellmwireless
-gkrellm-x86info
-gkrellshoot
-gkrellweather
-glark
-gmrun
-gnuit
-gnupg
-gnupg2
-gnupg-agent
-gnutls-bin
-gpart
-gparted
-gpgsm
-gpgv
-gphoto2
-gpm
-grabc
-graphviz
-grep
-grepmail
-groff
-grub-imageboot
-gsfonts
-gsfonts-x11
-gsm-utils
-gtkam
-guessnet
-gv
-gzrt
-haproxy
-harden-tools
-hdapsd
-hddtemp
-hexedit
-hfsplus
-hfsprogs
-hfsutils
-hgsvn
-hibernate
-hicolor-icon-theme
-hostapd
-hostap-utils
-hotswap-text
-hoz
-hping3
-ht
-htcheck
-html2text
-htop
-httperf
-httping
-httptunnel
-hunspell
-hunspell-en-us
-hunspell-de-de
-hunt
-hwdata
-hwloc
-i2c-tools
-i3-wm
-i810switch
-ibod
-iceweasel
-icheck
-icmpush
-id3
-id3v2
-idesk
-ifenslave
-ifmetric
-ifrename
-ifstat
-iftop
-ifupdown
-ifupdown-extra
-ihu
-ii
-iisemulator
-imagemagick
-imapcopy
-imapfilter
-imediff2
-imsniff
-im-switch
-imvirt
-imwheel
-inadyn
-indent
-infiniband-diags
-info
-info2www
-ink
-inoticoming
-inotify-tools
-input-utils
-intltool-debian
-iodine
-iotop
-ipcalc
-iperf
-ipgrab
-ipkungfu
-ipmitool
-ipppd
-iprelay
-iproute
-ipsec-tools
-iptables
-iptraf
-iptstate
-iputils-arping
-iputils-ping
-iputils-tracepath
-ipv6calc
-ipvsadm
-ipython
-ircii
-irda-utils
-irqbalance
-irssi
-irssi-plugin-xmpp
-irssi-scripts
-isc-dhcp-client
-iscsitarget
-isdnutils-base
-isdnvboxclient
-isync
-itop
-ivtv-utils
-iw
-iwatch
-jailer
-jed
-jed-common
-jed-extra
-jfsutils
-jhead
-jigit
-jigl
-joe
-john
-joystick
-jp2a
-juke
-kanif
-keepalived
-ketchup
-kexec-tools
-keychain
-keynav
-keyutils
-kismet
-knockd
-knocker
-konwert
-kpartx
-krb5-config
-krb5-user
-ksh
-kvm
-labrea
-laptop-mode-tools
-latencytop
-lbdb
-ldapscripts
-ldap-utils
-ldapvi
-lde
-ldnsutils
-leave
-lft
-lftp
-libaa-bin
-libcap2-bin
-libewf1
-libnss-mdns
-libnss-myhostname
-libsmbios-bin
-lighttpd
-lilo
-links
-links2
-lintian
-linuxdoc-tools
-linuxlogo
-linux-sound-base
-listadmin
-lltag
-lm-sensors
-loadlin
-localepurge
-locales
-lockfile-progs
-logapp
-login
-logrotate
-logtools
-logwatch
-lrzsz
-lsb-base
-lsb-release
-lsdvd
-lshw
-lsof
-lsscsi
-ltrace
-lua50
-luasocket
-luvcview
-lwatch
-lxc
-lynx-cur
-lzma
-lzop
-m17n-db
-m4
-macchanger
-macutils
-madison-lite
-magicrescue
-mailcheck
-maildirsync
-mailfilter
-mailplate
-mairix
-make
-makejail
-makepasswd
-man-db
-manpages
-manpages-dev
-markdown
-mathomatic
-mawk
-mb2md
-mbmon
-mboxcheck
-mboxgrep
-mbr
-mbuffer
-mc
-mcabber
-mcelog
-mdetect
-medusa
-memstat
-memtest86+
-memtester
-menu
-menu-xdg
-mercurial
-mesa-utils
-mg
-migrationtools
-mii-diag
-mikmod
-mime-support
-minicom
-mixmaster
-mkcue
-mkelfimage
-mklibs-copy
-mknbi
-mksh
-mlocate
-mmv
-moc
-modem-cmd
-module-assistant
-molly-guard
-monit
-moreutils
-mosh
-most
-mount
-mp
-mp3gain
-mp3info
-mp3splt
-mp3val
-mpack
-mpc
-mpg123-alsa
-mpg321
-mplayer
-mpt-status
-mr
-mrb
-msmtp
-msort
-mtd-utils
-mtools
-mtpaint
-mtp-tools
-mtr-tiny
-mt-st
-multipath-tools
-multitail
-multitee
-mutt
-muttprofile
-mysql-client
-mysql-common
-nano
-nasm
-nast
-nbd-client
-nbd-server
-nbtscan
-ncc
-ncdu
-ncftp
-ncmpc
-ncurses-base
-ncurses-bin
-ncurses-term
-ndisc6
-ndiswrapper-utils-1.9
-ne
-netbase
-netcat-openbsd
-netdiag
-netdiscover
-nethack-common
-nethack-console
-nethogs
-netmask
-netpbm
-netpipe-tcp
-netrik
-netris
-netrw
-netsed
-netsniff-ng
-netsurf
-net-tools
-netwag
-netwox
-newsbeuter
-nfs-kernel-server
-nfswatch
-nginx
-ngrep
-nictools-pci
-nikto
-nilfs-tools
-nload
-nmap
-normalize-audio
-nsd
-ntfs-3g
-ntlmaps
-ntp
-ntpdate
-nullidentd
-numactl
-num-utils
-nutcpc
-nvi
-nvidia-xconfig
-nvtv
-obconf
-obexftp
-obexpushd
-odt2txt
-oinkmaster
-olsrd
-olsrd-plugins
-opalmod
-openafs-client
-openafs-krb5
-openbox
-openipmi
-open-iscsi
-opensc
-openssl
-open-vm-tools
-openvpn
-orange
-osdsh
-osiris
-os-prober
-oss-compat
-p0f
-p3scan
-p7zip
-packeth
-packit
-pads
-pal
-paperkey
-par
-par2
-paris-traceroute
-partclone
-parted
-partimage
-partimage-server
-passwd
-patch
-patcher
-patchutils
-pavuk
-pax
-paxctl
-pax-utils
-pbuilder
-pbzip2
-pcaputils
-pcmciautils
-pconf-detect
-pconsole
-pcregrep
-pcscd
-pdfcube
-pdksh
-pdmenu
-pdns-recursor
-pdsh
-perforate
-perl
-perl-doc
-perlmagick
-perl-modules
-perl-tk
-pfqueue
-pia
-pigz
-pilot-link
-pinentry-curses
-pinfo
-pisg
-piuparts
-pkg-config
-pktstat
-playmidi
-plptools
-pmailq
-pmount
-pngtools
-pnm2ppa
-pnputils
-po-debconf
-podget
-podracer
-polipo
-pop3browser
-poppler-utils
-pork
-portsentry
-posh
-poster
-postfix
-postfix-pcre
-postgresql-client
-postmark
-powermgmt-base
-powertop
-pperl
-ppp
-pppconfig
-pppoeconf
-pppstatus
-pptpd
-pptp-linux
-preload
-pristine-tar
-privbind
-privoxy
-procinfo
-procmail
-procmeter3
-procps
-proxsmtp
-proxychains
-proxycheck
-psad
-pscan
-psmisc
-pssh
-pstotext
-psutils
-pterm
-ptunnel
-pump
-puppet
-puppetmaster
-pv
-pwgen
-pwman3
-pxe
-pydb
-pymacs
-pyneighborhood
-python
-python-apt
-python-cddb
-python-central
-python-crypto
-python-dbus
-python-eyed3
-python-fuse
-python-gnupginterface
-python-gobject
-python-id3
-python-minimal
-python-pexpect
-python-pycallgraph
-python-pymad
-python-pysqlite2
-python-pyvorbis
-python-scapy
-python-setuptools
-python-subversion
-python-support
-python-twisted-bin
-python-urwid
-qc-usb-utils
-qiv
-qla-tools
-quilt
-quota
-racoon
-radeontool
-radio
-radvd
-rake
-randomize-lines
-ratpoison
-rats
-rblcheck
-rcov
-rcs
-rdate
-rdesktop
-rdfind
-read-edid
-readline-common
-readpst
-realpath
-recode
-recordmydesktop
-recoverjpeg
-redir
-reiser4progs
-reiserfsprogs
-remind
-renameutils
-reniced
-reportbug
-reprepro
-reptyr
-rfkill
-rinetd
-rinse
-rkhunter
-rlwrap
-rng-tools
-rofs
-root-tail
-rox-filer
-rpcbind
-rpl
-rpm
-rrdtool
-rs
-rsnapshot
-rssh
-rtorrent
-rubilicious
-ruby
-ruby1.8
-ruby1.8-examples
-ruby-prof
-rungetty
-runit
-rutilt
-rxvt-beta
-rxvt-unicode
-s3cmd
-safecopy
-saidar
-samba
-samba-common
-samdump2
-sash
-sc
-scalpel
-scamper
-scanlogd
-scanmem
-scantv
-schedtool
-scli
-scmxx
-scons
-scponly
-screen
-screenie
-scrot
-scrounge-ntfs
-scsitools
-sdate
-sdparm
-secure-delete
-secvpn
-sed
-sendemail
-sendfile
-sendip
-sensord
-ser2net
-setcd
-setserial
-sg3-utils
-sgml-base
-sgmltools-lite
-sgrep
-shaperd
-shared-mime-info
-sharutils
-shorewall
-shtool
-sic
-sigit
-sipsak
-sip-tester
-sitecopy
-sl
-slapd
-slay
-sleepd
-sleepenh
-sleuthkit
-sloccount
-slrn
-slrnface
-slrnpull
-slsh
-slurm
-sm
-smartmontools
-smbc
-smbclient
-smbldap-tools
-smb-nat
-smbnetfs
-sn
-snarf
-sniffit
-snmp
-socat
-sox
-speedometer
-speex
-splint
-sqlite
-sqlite3
-squid
-squid-common
-squidview
-src2tex
-ssdeep
-ssed
-ssh
-ssh-askpass
-sshfs
-ssl-cert
-ssldump
-sslscan
-ssmping
-statgrab
-statserial
-stealth
-steghide
-stow
-streamripper
-stress
-stressapptest
-stunnel4
-subversion
-subversion-tools
-sucrack
-sudo
-sudoku
-super
-supercat
-sux
-swaks
-swatch
-swish++
-symlinks
-synergy
-syrep
-sysfsutils
-sysprof
-sysstat
-systune
-sysvinit
-sysvinit-utils
-tableau-parm
-tagtool
-tailor
-taktuk
-tar
-tart
-tcc
-tcl8.4
-tcng
-tcpd
-tcpdump
-tcpick
-tcpreen
-tcpreplay
-tcpspy
-tcpstat
-tcptrace
-tcptraceroute
-tcptrack
-tcputils
-tcpxtract
-tcsh
-tdl
-telak
-telnetd-ssl
-telnet-ssl
-testdisk
-tetrinet-client
-texi2html
-texinfo
-textdraw
-tf
-tgt
-tig
-timelimit
-tin
-tinyhoneypot
-tk8.4
-tmpreaper
-tmux
-tnef
-tofrodos
-toilet
-tor
-tpconfig
-tpp
-t-prot
-traceroute
-transfig
-trayer
-tree
-treil
-trickle
-tshark
-tsocks
-ttf-dejavu
-ttysnoop
-tweak
-twolame
-txt2man
-txt2pdbdoc
-txt2regex
-tzdata
-u3-tool
-ucf
-udftools
-udpcast
-udptunnel
-ulogd
-uml-utilities
-unace
-unclutter
-uncrustify
-unhide
-uni2ascii
-unicode
-unifont
-unison
-units
-uniutils
-unp
-unrtf
-unsort
-unzip
-update-inetd
-upx-ucl
-urlscan
-urlview
-uruk
-usb-modeswitch
-usbview
-userinfo
-util-linux
-util-linux-locales
-uudeview
-v4l-conf
-vbetool
-vbindiff
-vblade
-vde2
-vera
-vfu
-videogen
-vim
-vim-addon-manager
-vim-common
-vim-gtk
-vim-gui-common
-vim-runtime
-vim-scripts
-vim-vimoutliner
-vinetto
-vkeybd
-vlan
-vnstat
-vobcopy
-vorbisgain
-vorbis-tools
-vpnc
-vrfy
-vrms
-vsftpd
-vtgrab
-vtun
-w3m
-w3m-img
-wajig
-wakeonlan
-wamerican-small
-wapiti
-wavemon
-wcalc
-wdiff
-webcam
-webcamd
-webcheck
-weblint-perl
-weplab
-wget
-whiptail
-whois
-whowatch
-wiggle
-wikipedia2text
-wikipediafs
-wipe
-wireshark
-wireshark-common
-wmaloader
-wmctrl
-wmii
-wondershaper
-wput
-wvdial
-wwwconfig-common
-x11-common
-x11vnc
-x86info
-xautolock
-xautomation
-xawtv
-xawtv-plugins
-xbacklight
-xbase-clients
-xbitmaps
-xcb
-xclip
-xcursor-themes
-xdelta
-xdelta3
-xdesktopwaves
-xfig
-xfonts-100dpi
-xfonts-75dpi
-xfonts-base
-xfonts-biznet-100dpi
-xfonts-biznet-75dpi
-xfonts-biznet-base
-xfonts-bolkhov-cp1251-75dpi
-xfonts-bolkhov-cp1251-misc
-xfonts-encodings
-xfonts-scalable
-xfonts-terminus
-xfonts-utils
-xfsdump
-xfsprogs
-xinetd
-xjed
-xkb-data
-xkbset
-xloadimage
-xml-core
-xmlindent
-xmlstarlet
-xmount
-xnee
-xnest
-xosd-bin
-xpdf
-xprobe
-xresprobe
-xrestop
-xrsh
-xsel
-xserver-xorg
-xserver-xorg-core
-xserver-xorg-input-all
-xserver-xorg-video-all
-xsltproc
-xtail
-xterm
-xtermcontrol
-xtermset
-xtightvncviewer
-xtrace
-xtrlock
-xtv
-xul-ext-webdeveloper
-xutils
-xutils-dev
-xvfb
-xvkbd
-xwit
-xzoom
-xz-utils
-yacpi
-yasr
-yeahconsole
-yersinia
-youtube-dl
-zerofree
-zfs-fuse
-zgv
-zile
-zip
-zoo
-zsh
-zsh-doc
-zssh
-zsync
-zzuf
-## }}}
-
-## non-free {{{
-agrep
-iozone3
-lha
-manpages-posix
-netperf
-python-profiler
-unrar
-## }}}
-
-## kernel-version dependent packages {{{
-linux-doc-3.1
-linux-tools-3.1
-## }}}
-
-## x86/32bit (class I386) specific packages {{{
-PACKAGES aptitude I386
-
-# i386-only software
-athcool
-atitvout
-bsign
-fnfx-client
-fnfxd
-pstack
-retty
-
-## current kernel version:
-#iscsitarget-module-3.1.0-grml
-linux-image-i386-grml
-#ndiswrapper-modules-3.1.0-grml
-#openafs-modules-3.1.0-grml
-#sysprof-module-3.1.0-grml
-#tp-smapi-modules-3.1.0-grml
-#virtualbox-ose-guest-modules-3.1.0-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-#xtables-addons-modules-3.1.0-grml
-## }}}
-
-## amd64 specific packages {{{
-PACKAGES aptitude AMD64
-
-## current kernel version:
-#iscsitarget-module-3.1.0-grml64
-linux-image-amd64-grml
-#ndiswrapper-modules-3.1.0-grml64
-#openafs-modules-3.1.0-grml64
-#sysprof-module-3.1.0-grml64
-#tp-smapi-modules-3.1.0-grml64
-#xtables-addons-modules-3.1.0-grml64
-#virtualbox-ose-guest-modules-3.1.0-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-## }}}
-
-# vim: foldmethod=marker
diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index bc13795..78477f8 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -56,8 +56,8 @@
 # Which FAI classes do you want to use by default?#
 
 # Notice: GRMLBASE is recommended in any case unless you *really* know what you
-# are doing; make sure to also use a GRML_* class (for example GRML_SMALL,
-# GRML_MEDIUM or GRML_FULL) to get an according kernel and also select the
+# are doing; make sure to also use a GRML_* class (for example GRML_SMALL
+# or GRML_FULL) to get an according kernel and also select the
 # architecture (I386 for x86; AMD64 for x86_64)
 # CLASSES="GRMLBASE,GRML_FULL,I386"
 
-- 
2.1.4