X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=6ea4d245b3733b2f8b28a6201ee0fbd43755812a;hp=458c40f859585fc873882049fa6491b517be5f3f;hb=af3b852c4bf755eecd2b15ee2c75bf1a5285c35a;hpb=f050593a3df26ee403f1510e0d5d17f933752125

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 458c40f..bd46816 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -16,45 +16,39 @@ PACKAGES aptitude
 ## }}}
 
 ## grml specific packages {{{
-3ware-cli-binary
 aamath
 advchk
 aesutil
 afflib
 amap
-asleap
 bfa
 bkp
-btsco
 cmospwd
-cpuburn-in-binary
-ctapi-cyberjack
 ctris
 dd-rhelp
-ded
 deletemail
 dired
 dupmerge
 dupseek
-dynamic-disk
 elizatalk
 ex
 ext3rminator
-firescope
 ftpbackup
-fvwm-crystal-minimal
 gateguardian
 gatling
 gifshuffle
 glipper-nognome
 grml-debugtools
 grml-desktop
+grml-docs
 grml-files
 grml-firefox
 grml-laptop
 grml-live
 grml-paste
 grml-pylib
+grml-quickconfig-standard
+grml-rescueboot
 grml-sectools
 grml-templates
 grml-terminalserver
@@ -66,13 +60,10 @@ icmp-mtu
 icmp-quench
 icmp-reset
 ipw-firmware
-lame
 lcdtest
 libacme-bleach-perl
 libacme-eyedrops-perl
 libacme-smirch-perl
-libpam-thinkfinger
-libstdc++2.10-glibc2.2
 md5deep
 minised
 msgid-chooser
@@ -81,42 +72,31 @@ ncp
 pip
 prism54-firmware
 prosilla
-pspax
 ptfinder
 rainbowcrack
 rootsh
-salvage-ntfs
 shadowfs
 shish
 shmux
 sitar
 smap
-speechd-up
 sudosh
 svn-ssh-wrappers
 tal
 texttools-doc
 thc-ipv6
 thinkfinger-tools
-tlswrap
-tpm-tools
-trousers
-udev
 upgrade-oldest
-zfs-fuse
 zsh-lovers
 ## }}}
 
 ## Official Debian packages {{{
-2vcard
-3270-common
 4g8
 9base
 9menu
 abcde
 abook
 acct
-ace-of-penguins
 ack-grep
 acl
 acpi
@@ -173,9 +153,7 @@ apt-utils
 apt-zip
 apwal
 ara
-archivemail
 argus-client
-aria2
 arj
 arping
 arp-scan
@@ -188,22 +166,14 @@ ascii2binary
 asciidoc
 asn1c
 asql
-asr-manpages
-astyle
 asused
 at
-aterm
 atftpd
-athcool
 athena-jot
-atitvout
 atop
 atsar
 attr
-aub
-aufs-tools
 aumix
-auto-apt
 autoconf
 automake
 automake1.4
@@ -218,7 +188,6 @@ away
 awesfx
 awesome
 axel
-axp
 backup2l
 backup-manager
 backuppc
@@ -231,7 +200,6 @@ base-passwd
 bash
 bash-builtins
 bash-doc
-bash-minimal
 bash-static
 bastille
 bb
@@ -243,7 +211,6 @@ bcrypt
 beep
 bfbtester
 biabam
-bibcursed
 bin86
 binclock
 bind9
@@ -260,7 +227,6 @@ bittorrent
 bittwist
 bkhive
 blktrace
-bluez-audio
 bluez-hcidump
 bluez-utils
 bmon
@@ -276,29 +242,21 @@ bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
-bsign
 btrfs-tools
 btscanner
 buffer
 build-essential
 burn
-busybox
 bvi
 bwm-ng
-bzip2
 c3270
-cabber
 cabextract
 caca-utils
 ca-certificates
 cadaver
-calcurse
-calife
-camserv
 capiutils
 catdoc
 cbm
-cbrowser
 ccache
 ccal
 cciss-vol-status
@@ -308,26 +266,20 @@ ccze
 cdbackup
 cdbs
 cdck
-cdda2wav
-cddb
 cd-discid
 cdebootstrap
-cdecl
 cdparanoia
 cdpr
-cdrbq
 cdrdao
-cdrecord
 cdrskin
-cdtool
 cedet-common
 centerim-utf8
 cereal
 cfengine2
 cfv
 cgdb
-check
 chkrootkit
+chntpw
 chrootuid
 clamav
 clamav-base
@@ -335,9 +287,7 @@ clamav-daemon
 clamav-freshclam
 clamav-testfiles
 clex
-clive
 cloop-utils
-cmatrix
 cmus
 codeville
 colorgcc
@@ -346,13 +296,8 @@ compartment
 concalc
 configure-debian
 conkeror
-conky
 connect-proxy
 conntrack
-console-common
-console-data
-console-terminus
-console-tools
 conspy
 convmv
 coreutils
@@ -372,7 +317,6 @@ cpulimit
 crack
 cracklib-runtime
 cramfsprogs
-cron
 crosshurd
 cryptcat
 cryptsetup
@@ -391,11 +335,8 @@ curl
 curlftpfs
 cvs
 cvs2cl
-cvs-buildpackage
 cvsconnect
 cvsdelta
-cw
-cwcp
 daemon
 dante-client
 dar
@@ -412,7 +353,6 @@ dcfldd
 dconf
 dcraw
 dctrl-tools
-ddccontrol
 ddclient
 ddrescue
 dds2tar
@@ -429,11 +369,9 @@ debian-reference-en
 debianutils
 debmirror
 debootstrap
-deborphan
 debsecan
 debsigs
 debsums
-defoma
 detachtty
 detox
 devio
@@ -452,9 +390,9 @@ dialog
 dict
 diction
 dictionaries-common
-dietlibc
 dietlibc-dev
 diffstat
+diffutils
 ding
 dir2ogg
 dirdiff
@@ -485,8 +423,6 @@ dpatch
 dpkg
 dpkg-awk
 dpkg-dev
-dpkg-ftp
-dpkg-multicd
 dpkg-repack
 dpkg-ruby
 dpkg-sig
@@ -501,7 +437,6 @@ dsniff
 dstat
 dtach
 dump
-dumputils
 duplicity
 dupload
 durep
@@ -511,8 +446,6 @@ dvdisaster
 dvd+rw-tools
 dvtm
 dwdiff
-dwm
-dwm-tools
 dzen2
 e2fsprogs
 e2tools
@@ -524,15 +457,14 @@ ed
 edbrowse
 eflite
 eieio
+ekeyd
 electric-fence
 elfsh
 elinks
-elmo
 elscreen
 elvis
 elvis-common
 emacs
-emcast
 emuga
 encfs
 enscribe
@@ -541,7 +473,6 @@ ent
 epdfview
 equivs
 erc
-es
 espeak
 espeakup
 etckeeper
@@ -551,8 +482,6 @@ ethstatus
 ethtool
 etpan-ng
 ettercap-gtk
-euro-support
-evilwm
 evms
 evms-bootdebug
 evms-cli
@@ -564,12 +493,12 @@ exiv2
 expect
 ext3grep
 exuberant-ctags
-faad
 facter
 fai-client
 fai-doc
 fail2ban
 fai-server
+fai-setup-storage
 fake
 fakeroot
 faketime
@@ -582,16 +511,10 @@ fbi
 fbset
 fbterm
 fcrackzip
-fdflush
 fdupes
-fdutils
 febootstrap
 feh
 fetchmail
-fgetty
-file
-filepp
-filetraq
 findutils
 finger
 fio
@@ -604,14 +527,9 @@ flex
 flexbackup
 flite
 fluxbox
-fluxconf
-fnfx-client
-fnfxd
-fnord
 fondu
 fontconfig
 fontconfig-config
-fonty
 foremost
 fortune-mod
 fortunes-debian-hints
@@ -632,9 +550,7 @@ funny-manpages
 fusedav
 fuseiso
 fuseiso9660
-fusesmb
 fuse-utils
-fvwm
 fwlogwatch
 fxload
 g++
@@ -650,7 +566,6 @@ geeqie
 gems
 genders
 genext2fs
-geresh
 getmail4
 gettext
 gettext-el
@@ -660,8 +575,6 @@ gftp-common
 gftp-text
 ghostscript
 giblib1
-gif2png
-giftcurs
 git-core
 git-email
 gitpkg
@@ -683,9 +596,7 @@ gnuit
 gnupg
 gnupg2
 gnupg-agent
-gnupg-pkcs11-scd
 gnutls-bin
-gocr
 gpart
 gparted
 gpgsm
@@ -693,7 +604,6 @@ gpgv
 gphoto2
 gpm
 gptsync
-gq
 grabc
 graphviz
 grep
@@ -707,12 +617,8 @@ guessnet
 guymager
 gv
 gzrt
-habak
-hal
-hal-info
 haproxy
 harden-tools
-hasciicam
 hdapsd
 hddtemp
 hexedit
@@ -722,11 +628,9 @@ hfsutils
 hgsvn
 hibernate
 hicolor-icon-theme
-hnb
 honeyd
 hostapd
 hostap-utils
-hotkeys
 hotkey-setup
 hotswap-text
 hoz
@@ -738,24 +642,24 @@ htop
 httperf
 httping
 httptunnel
+hunspell
+hunspell-en-us
+hunspell-de-de
 hunt
 hwdata
+hwloc
 i2c-tools
+i3-wm
 i810switch
-i8kutils
 ibod
-ibritish
-icecast2
 iceweasel
 icheck
 icmpush
 id3
 id3v2
 idesk
-idswakeup
 ifenslave-2.6
 ifmetric
-ifplugd
 ifrename
 ifstat
 iftop
@@ -764,7 +668,6 @@ ifupdown-extra
 ihu
 ii
 iisemulator
-ike-scan
 imagemagick
 imapcopy
 imapfilter
@@ -774,9 +677,9 @@ im-switch
 imwheel
 inadyn
 indent
+infiniband-diags
 info
 info2www
-ingerman
 ink
 inotail
 inoticoming
@@ -801,7 +704,6 @@ iputils-ping
 iputils-tracepath
 ipv6calc
 ipvsadm
-ipx
 ipython
 irb
 ircii
@@ -810,21 +712,17 @@ irqbalance
 irssi
 irssi-plugin-xmpp
 irssi-scripts
-isakmpd
 iscsitarget
-isdnactivecards
 isdnutils-base
 isdnvboxclient
-ispell
 isync
 itop
 ivtv-utils
+iw
 iwatch
 jack
 jackd
-jail
 jailer
-jailtool
 jed
 jed-common
 jed-extra
@@ -832,15 +730,12 @@ jfsutils
 jhead
 jigit
 jigl
-jikes
 joe
 john
 joystick
 jp2a
 juke
-jwm
 kanif
-kbd-compat
 keepalived
 kernel-package
 ketchup
@@ -853,7 +748,6 @@ knockd
 knocker
 konwert
 kpartx
-kqemu-common
 krb5-config
 krb5-user
 ksh
@@ -867,28 +761,17 @@ ldap-utils
 ldapvi
 lde
 ldnsutils
-ld.so.preload-manager
 leave
-less
 lft
 lftp
 libaa-bin
 libcap2-bin
 libewf1
 libnss-mdns
-libpam-chroot
-libpam-devperm
-libpam-dotfile
-libpam-modules
-libpam-mount
-libpam-smbpass
-libpam-ssh
-libpam-tmpdir
 libsmbios-bin
 libtool
 lighttpd
 lilo
-linda
 links
 links2
 lintian
@@ -896,37 +779,33 @@ linuxdoc-tools
 linuxlogo
 linux-sound-base
 listadmin
-live-initramfs
-lkl
 lltag
 lm-sensors
 loadlin
 localepurge
 locales
 lockfile-progs
-loco
 log2mail
 logapp
 login
 logrotate
 logtools
 logwatch
-loop-aes-utils
 loop-aes-testsuite
+loop-aes-utils
 lrzsz
 lsb-base
 lsb-release
 lsdvd
 lshw
-lslk
 lsof
 lsscsi
 ltrace
 lua50
 luasocket
 luvcview
-lvm2
 lwatch
+lxc
 lynx
 lzma
 lzop
@@ -960,7 +839,6 @@ mbuffer
 mc
 mcabber
 mcelog
-mdadm
 mdetect
 medusa
 memstat
@@ -970,65 +848,49 @@ menu
 menu-xdg
 mercurial
 mesa-utils
-metamail
 mg
-mgetty
-mgp
 migrationtools
 mii-diag
 mikmod
 mime-support
 minicom
-mirrordir
 mixmaster
 mkcue
 mkelfimage
-mkisofs
 mklibs-copy
 mknbi
 mksh
 mlocate
 mmv
 moc
-modconf
 modem-cmd
 module-assistant
-module-init-tools
 molly-guard
 monit
-moosic
 moreutils
 most
 mount
 mp
-mp3blaster
-mp3c
 mp3gain
 mp3info
 mp3splt
 mp3val
-mp3wrap
 mpack
-mpage
 mpc
 mpg123-alsa
 mpg321
 mplayer
-mplayer-skin-blue
 mpt-status
 mr
 mrb
-mrxvt
-mrxvt-common
 msmtp
 msort
-mtd-tools
+mtd-utils
 mtools
 mtpaint
 mtp-tools
 mtr-tiny
 mt-st
-multi-aterm
 multipath-tools
 multitail
 multitee
@@ -1037,7 +899,6 @@ mutt
 muttprofile
 mysql-client
 mysql-common
-naim
 nano
 nasm
 nast
@@ -1048,14 +909,12 @@ ncc
 ncdu
 ncftp
 ncmpc
-ncpfs
 ncurses-base
 ncurses-bin
 ncurses-term
 ndisc6
 ndiswrapper-utils-1.9
 ne
-nedit
 netbase
 netcat
 netcat6
@@ -1071,17 +930,16 @@ netrik
 netris
 netrw
 netsed
-netstat-nat
+netsniff-ng
 netsurf
 net-tools
 netwag
 netwox
 newsbeuter
-nfs-common
 nfs-kernel-server
 nfswatch
+nginx
 ngrep
-nictools-nopci
 nictools-pci
 nikto
 nilfs2-tools
@@ -1090,13 +948,13 @@ nmap
 normalize-audio
 noshell
 nsd
-nstx
 ntfs-3g
 ntfsprogs
 ntlmaps
 ntp
 ntpdate
 nullidentd
+numactl
 num-utils
 nutcpc
 nvi
@@ -1106,7 +964,6 @@ obconf
 obexftp
 obexpushd
 odt2txt
-offlineimap
 oinkmaster
 olsrd
 olsrd-plugins
@@ -1115,13 +972,10 @@ opalmod
 openafs-client
 openafs-krb5
 openbox
-opencryptoki
 openipmi
 open-iscsi
 openjade
 opensc
-openssh-client
-openssh-server
 openssl
 openvas-client
 open-vm-tools
@@ -1142,7 +996,6 @@ packeth
 packit
 pads
 pal
-pamusb-tools
 paperkey
 par
 par2
@@ -1161,25 +1014,16 @@ pax-utils
 pbuilder
 pbzip2
 pcaputils
-pciutils
 pcmciautils
 pconf-detect
 pconsole
-pcopy
 pcregrep
 pcscd
 pdfcube
 pdksh
 pdmenu
-pdns-backend-ldap
-pdns-backend-pgsql
-pdns-backend-pipe
-pdns-backend-sqlite
 pdns-recursor
-pdns-server
 pdsh
-pdumpfs
-pekwm
 perforate
 perl
 perl-doc
@@ -1198,10 +1042,8 @@ piuparts
 pkg-config
 pktstat
 playmidi
-playmp3list
 plptools
 pmailq
-pmidi
 pmount
 pngtools
 pnm2ppa
@@ -1209,7 +1051,6 @@ pnputils
 po-debconf
 podget
 podracer
-policyrcd-script-zg2
 polipo
 pop3browser
 poppler-utils
@@ -1227,7 +1068,6 @@ powermgmt-base
 powernowd
 powertop
 pperl
-ppmd
 ppp
 pppconfig
 pppoe
@@ -1249,11 +1089,8 @@ proxychains
 proxycheck
 psad
 pscan
-psfontmgr
-psh
 psmisc
 pssh
-pstack
 pstotext
 psutils
 pterm
@@ -1269,25 +1106,20 @@ pymacs
 pyneighborhood
 python
 python2.4
-python2.4-minimal
 python2.5
 python2.5-minimal
 python-apt
 python-cddb
-python-celementtree
 python-central
 python-crypto
 python-dbus
-python-elementtree
 python-eyed3
 python-fuse
 python-gnupginterface
 python-gobject
 python-id3
-python-libgmail
 python-minimal
 python-pexpect
-python-pyao
 python-pycallgraph
 python-pymad
 python-pysqlite2
@@ -1311,12 +1143,8 @@ racoon
 radeontool
 radio
 radvd
-rain
 rake
 randomize-lines
-ras
-ratmenu
-ratpoison
 rats
 rblcheck
 rc
@@ -1324,15 +1152,12 @@ rcov
 rcs
 rdate
 rdesktop
-rdiff
-rdiff-backup
 rdoc
 rdoc1.8
 read-edid
 readline-common
 readpst
 realpath
-realtime-lsm
 recode
 recordmydesktop
 recover
@@ -1345,24 +1170,19 @@ renameutils
 reniced
 reportbug
 reprepro
-resolvconf
-retty
 rinetd
 rinse
 rkhunter
 rlwrap
-rman
 rng-tools
 rofs
 root-tail
-router-audit-tool
 rox-filer
 rpl
 rpm
 rrdtool
 rsnapshot
 rssh
-rsync
 rtorrent
 rubilicious
 ruby
@@ -1375,10 +1195,8 @@ rutilt
 rxvt-beta
 rxvt-unicode
 s3cmd
-s3switch
 safecopy
 saidar
-sam
 samba
 samba-common
 samdump2
@@ -1399,10 +1217,8 @@ screen
 screenie
 scrot
 scrounge-ntfs
-scsiadd
 scsitools
 sdate
-sdd
 sdparm
 secure-delete
 secvpn
@@ -1414,7 +1230,6 @@ sensord
 ser2net
 setcd
 setserial
-sfind
 sformat
 sg3-utils
 sgml-base
@@ -1424,7 +1239,6 @@ sgrep
 shaperd
 shared-mime-info
 sharutils
-shc
 shorewall
 shtool
 sic
@@ -1434,7 +1248,6 @@ sip-tester
 sitecopy
 sl
 slapd
-slat
 slay
 sleepd
 sleepenh
@@ -1446,7 +1259,6 @@ slrnpull
 slsh
 slurm
 sm
-smake
 smartmontools
 smbc
 smbclient
@@ -1458,8 +1270,6 @@ sn
 snarf
 sniffit
 snmp
-snoopy
-snowdrop
 socat
 sox
 sp
@@ -1470,9 +1280,7 @@ speedometer
 speex
 spell
 spellutils
-spicctrl
 splint
-splitvt
 sqlite
 sqlite3
 squashfs-lzma-tools
@@ -1490,14 +1298,11 @@ ssl-cert
 ssldump
 sslscan
 ssmping
-star
-starttls
 statgrab
 statserial
 stealth
 steghide
 stow
-strace
 streamripper
 stress
 stressapptest
@@ -1511,7 +1316,6 @@ super
 supercat
 sux
 swaks
-swapd
 swatch
 swish++
 symlinks
@@ -1531,7 +1335,6 @@ taktuk
 tar
 tart
 tcc
-tcl8.3
 tcl8.4
 tcng
 tcpd
@@ -1560,27 +1363,22 @@ texinfo
 textdraw
 tf
 tgt
-thttpd
 tidy
 tig
 timelimit
 tin
 tinyhoneypot
 tk8.4
-tla
 tmpreaper
+tmux
 tn5250
 tnef
 tofrodos
 toilet
-toilet-fonts
 tor
-toshset
-toshutils
 tpconfig
 tpp
 t-prot
-tra
 traceroute
 transfig
 trayer
@@ -1589,12 +1387,9 @@ treil
 trickle
 tshark
 tsocks
-tss
 ttf-dejavu
-ttmkfdir
 ttysnoop
 tweak
-twm
 twolame
 txt2man
 txt2pdbdoc
@@ -1605,6 +1400,7 @@ ucf
 udftools
 udpcast
 udptunnel
+ufsutils
 ulogd
 uml-utilities
 unace
@@ -1617,7 +1413,6 @@ unifont
 unison
 units
 uniutils
-unixcw
 unp
 unrar-free
 unrtf
@@ -1628,11 +1423,10 @@ upx-ucl
 urlscan
 urlview
 uruk
-usbutils
+usb-modeswitch
 usbview
 userinfo
 user-setup
-uswsusp
 util-linux
 util-linux-locales
 uudeview
@@ -1640,7 +1434,6 @@ v4l-conf
 vbetool
 vbindiff
 vblade
-vcdtools
 vde2
 vera
 vfu
@@ -1671,21 +1464,16 @@ vtun
 w3m
 w3m-el
 w3m-img
-w9wm
-wacom-tools
 wajig
 wakeonlan
 wamerican-small
 wapiti
-waproamd
 wavemon
 wcalc
 wdiff
 webcam
 webcamd
-webcam-server
 webcheck
-webcpp
 weblint-perl
 weechat
 weechat-curses
@@ -1700,28 +1488,20 @@ wiggle
 wikipedia2text
 wikipediafs
 wipe
-wireless-tools
 wireshark
 wireshark-common
 wmaloader
 wmctrl
 wmii
-wmmisc
 wondershaper
-wpasupplicant
-wprint
 wput
 wvdial
 wwwconfig-common
-wyrd
 x11-common
 x11vnc
-x2x
 x86info
-xar
 xautolock
 xautomation
-xaw3dg
 xawtv
 xawtv-plugins
 xbacklight
@@ -1745,11 +1525,9 @@ xfonts-biznet-base
 xfonts-bolkhov-cp1251-75dpi
 xfonts-bolkhov-cp1251-misc
 xfonts-encodings
-xfonts-intl-european
 xfonts-scalable
 xfonts-terminus
 xfonts-utils
-xfs
 xfsdump
 xfsprogs
 xinetd
@@ -1757,7 +1535,6 @@ xjed
 xkb-data
 xkbset
 xloadimage
-xlockmore
 xml-core
 xmlindent
 xmlstarlet
@@ -1782,54 +1559,8 @@ xrsh
 xsel
 xserver-xorg
 xserver-xorg-core
-xserver-xorg-input-aiptek
 xserver-xorg-input-all
-xserver-xorg-input-elographics
-xserver-xorg-input-evdev
-xserver-xorg-input-evtouch
-xserver-xorg-input-hyperpen
-xserver-xorg-input-joystick
-xserver-xorg-input-kbd
-xserver-xorg-input-mouse
-xserver-xorg-input-penmount
-xserver-xorg-input-synaptics
-xserver-xorg-input-vmmouse
-xserver-xorg-input-void
-xserver-xorg-input-wacom
 xserver-xorg-video-all
-xserver-xorg-video-amd
-xserver-xorg-video-apm
-xserver-xorg-video-ark
-xserver-xorg-video-ati
-xserver-xorg-video-chips
-xserver-xorg-video-cirrus
-xserver-xorg-video-dummy
-xserver-xorg-video-fbdev
-xserver-xorg-video-glint
-xserver-xorg-video-i128
-xserver-xorg-video-i740
-xserver-xorg-video-intel
-xserver-xorg-video-ivtv
-xserver-xorg-video-mga
-xserver-xorg-video-neomagic
-xserver-xorg-video-nv
-xserver-xorg-video-radeonhd
-xserver-xorg-video-rendition
-xserver-xorg-video-s3
-xserver-xorg-video-s3virge
-xserver-xorg-video-savage
-xserver-xorg-video-siliconmotion
-xserver-xorg-video-sis
-xserver-xorg-video-sisusb
-xserver-xorg-video-tdfx
-xserver-xorg-video-tga
-xserver-xorg-video-trident
-xserver-xorg-video-tseng
-xserver-xorg-video-v4l
-xserver-xorg-video-vesa
-xserver-xorg-video-via
-xserver-xorg-video-vmware
-xserver-xorg-video-voodoo
 xsltproc
 xtail
 xterm
@@ -1844,22 +1575,21 @@ xutils
 xutils-dev
 xvfb
 xvkbd
-xvncviewer
 xwit
 xzoom
+xz-utils
 yacpi
-yaird
 yasr
 yatm
 yeahconsole
 yersinia
 youtube-dl
-ysm
 zec
+zerofree
+zfs-fuse
 zgv
 zile
 zip
-zlib1g
 zoidberg
 zoo
 zsh
@@ -1871,26 +1601,17 @@ zzuf
 ## }}}
 
 ## non-free {{{
-abs-guide
 agrep
 atmel-firmware
 bluez-firmware
-chntpw
-dvdrtools
-figlet
 firmware-iwlwifi
 firmware-qlogic
 firmware-ralink
 iozone3
-irpas
 lha
-# lmbench
 manpages-posix
 netperf
-# nttcp
 python-profiler
-rar
-sl-modem-daemon
 unrar
 zd1211-firmware
 ## }}}
@@ -1900,29 +1621,38 @@ PACKAGES aptitude I386
 
 ## general:
 grml
+linux-tools-2.6.36
+
+# i386-only software
+athcool
+atitvout
+bsign
+fnfx-client
+fnfxd
+pstack
+retty
+s3switch
+spicctrl
+
 # use linux-kernel-headers-grml instead of linux-libc-dev?
 # linux-kernel-headers-grml
 
-## current kernel version 2.6.31-grml:
-aufs-modules-2.6.31-grml
-drbd8-2.6.31-grml
-#fglrx-kernel-2.6.31-grml
-iscsitarget-module-2.6.31-grml
-kqemu-modules-2.6.31-grml
-linux-doc-2.6.31-grml
-linux-headers-2.6.31-grml
-linux-image-2.6.31-grml
-#linux-source-2.6.31-grml
-loop-aes-modules-2.6.31-grml
-ndiswrapper-modules-2.6.31-grml
-#nvidia-kernel-2.6.31-grml
-openafs-modules-2.6.31-grml
-sl-modem-modules-2.6.31-grml
-speakup-modules-2.6.31-grml
-sysprof-module-2.6.31-grml
-tp-smapi-modules-2.6.31-grml
-virtualbox-ose-guest-modules-2.6.31-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-2.6.31-grml
+## current kernel version 2.6.36-grml:
+#fglrx-kernel-2.6.36-grml
+iscsitarget-module-2.6.36-grml
+linux-doc-2.6.36-grml
+linux-headers-2.6.36-grml
+linux-image-2.6.36-grml
+#linux-source-2.6.36-grml
+loop-aes-modules-2.6.36-grml
+ndiswrapper-modules-2.6.36-grml
+#nvidia-kernel-2.6.36-grml
+openafs-modules-2.6.36-grml
+speakup-modules-2.6.36-grml
+sysprof-module-2.6.36-grml
+tp-smapi-modules-2.6.36-grml
+virtualbox-ose-guest-modules-2.6.36-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+xtables-addons-modules-2.6.36-grml
 ## }}}
 
 ## amd64 specific packages {{{
@@ -1930,25 +1660,24 @@ PACKAGES aptitude AMD64
 
 ## general:
 grml64
+linux-tools-2.6.36
 
-## current kernel version 2.6.31-grml64:
-aufs-modules-2.6.31-grml64
-drbd8-2.6.31-grml64
-#fglrx-kernel-2.6.31-grml64
-iscsitarget-module-2.6.31-grml64
-kqemu-modules-2.6.31-grml64
-linux-doc-2.6.31-grml64
-linux-headers-2.6.31-grml64
-linux-image-2.6.31-grml64
-#linux-source-2.6.31-grml
-loop-aes-modules-2.6.31-grml64
-ndiswrapper-modules-2.6.31-grml64
-#nvidia-kernel-2.6.31-grml64
-openafs-modules-2.6.31-grml64
-speakup-modules-2.6.31-grml64
-sysprof-module-2.6.31-grml64
-xtables-addons-modules-2.6.31-grml64
-#virtualbox-ose-guest-modules-2.6.31-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
+## current kernel version 2.6.36-grml64:
+#fglrx-kernel-2.6.36-grml64
+iscsitarget-module-2.6.36-grml64
+linux-doc-2.6.36-grml64
+linux-headers-2.6.36-grml64
+linux-image-2.6.36-grml64
+#linux-source-2.6.36-grml
+loop-aes-modules-2.6.36-grml64
+ndiswrapper-modules-2.6.36-grml64
+#nvidia-kernel-2.6.36-grml64
+openafs-modules-2.6.36-grml64
+speakup-modules-2.6.36-grml64
+sysprof-module-2.6.36-grml64
+tp-smapi-modules-2.6.36-grml64
+xtables-addons-modules-2.6.36-grml64
+virtualbox-ose-guest-modules-2.6.36-grml64 virtualbox-ose-guest-utils virtualbox-ose-guest-x11
 ## }}}
 
 # vim: foldmethod=marker