X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=5c8d3df4a315927c6bde883227405ee8a7d9f5d4;hp=e3d920c00ae658fdd7c7aefe3ecd3844717eb890;hb=c00baf7aa8540f934fba232708020db0316fc576;hpb=07409bb6a0f72106d6a821d595dc616d954e361f

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index e3d920c..5c8d3df 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -23,9 +23,7 @@ afflib
 amap
 bfa
 bkp
-btsco
 cmospwd
-cpuburn-in-binary
 ctris
 dd-rhelp
 deletemail
@@ -36,7 +34,6 @@ elizatalk
 ex
 ext3rminator
 ftpbackup
-fvwm-crystal-minimal
 gateguardian
 gatling
 gifshuffle
@@ -51,6 +48,7 @@ grml-live
 grml-paste
 grml-pylib
 grml-quickconfig-standard
+grml-rescueboot
 grml-sectools
 grml-templates
 grml-terminalserver
@@ -66,7 +64,6 @@ lcdtest
 libacme-bleach-perl
 libacme-eyedrops-perl
 libacme-smirch-perl
-libstdc++2.10-glibc2.2
 md5deep
 minised
 msgid-chooser
@@ -75,7 +72,6 @@ ncp
 pip
 prism54-firmware
 prosilla
-pspax
 ptfinder
 rainbowcrack
 rootsh
@@ -84,7 +80,6 @@ shish
 shmux
 sitar
 smap
-speechd-up
 sudosh
 svn-ssh-wrappers
 tal
@@ -92,7 +87,6 @@ texttools-doc
 thc-ipv6
 thinkfinger-tools
 upgrade-oldest
-zfs-fuse
 zsh-lovers
 ## }}}
 
@@ -175,9 +169,7 @@ asql
 asused
 at
 atftpd
-athcool
 athena-jot
-atitvout
 atop
 atsar
 attr
@@ -208,8 +200,6 @@ base-passwd
 bash
 bash-builtins
 bash-doc
-bash-minimal
-bash-static
 bastille
 bb
 bbe
@@ -251,7 +241,6 @@ bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
-bsign
 btrfs-tools
 btscanner
 buffer
@@ -260,16 +249,13 @@ burn
 bvi
 bwm-ng
 c3270
-cabber
 cabextract
 caca-utils
 ca-certificates
 cadaver
-camserv
 capiutils
 catdoc
 cbm
-cbrowser
 ccache
 ccal
 cciss-vol-status
@@ -279,19 +265,15 @@ ccze
 cdbackup
 cdbs
 cdck
-cdda2wav
 cd-discid
 cdebootstrap
 cdparanoia
 cdpr
-cdrbq
 cdrdao
-cdrecord
 cdrskin
 cedet-common
 centerim-utf8
 cereal
-cfengine2
 cfv
 cgdb
 chkrootkit
@@ -314,9 +296,6 @@ configure-debian
 conkeror
 connect-proxy
 conntrack
-console-data
-console-terminus
-console-tools
 conspy
 convmv
 coreutils
@@ -409,7 +388,6 @@ dialog
 dict
 diction
 dictionaries-common
-dietlibc
 dietlibc-dev
 diffstat
 diffutils
@@ -443,8 +421,6 @@ dpatch
 dpkg
 dpkg-awk
 dpkg-dev
-dpkg-ftp
-dpkg-multicd
 dpkg-repack
 dpkg-ruby
 dpkg-sig
@@ -459,7 +435,6 @@ dsniff
 dstat
 dtach
 dump
-dumputils
 duplicity
 dupload
 durep
@@ -469,8 +444,6 @@ dvdisaster
 dvd+rw-tools
 dvtm
 dwdiff
-dwm
-dwm-tools
 dzen2
 e2fsprogs
 e2tools
@@ -486,12 +459,10 @@ ekeyd
 electric-fence
 elfsh
 elinks
-elmo
 elscreen
 elvis
 elvis-common
 emacs
-emcast
 emuga
 encfs
 enscribe
@@ -509,7 +480,6 @@ ethstatus
 ethtool
 etpan-ng
 ettercap-gtk
-evilwm
 evms
 evms-bootdebug
 evms-cli
@@ -526,6 +496,7 @@ fai-client
 fai-doc
 fail2ban
 fai-server
+fai-setup-storage
 fake
 fakeroot
 faketime
@@ -538,7 +509,6 @@ fbi
 fbset
 fbterm
 fcrackzip
-fdflush
 fdupes
 febootstrap
 feh
@@ -555,9 +525,6 @@ flex
 flexbackup
 flite
 fluxbox
-fluxconf
-fnfx-client
-fnfxd
 fondu
 fontconfig
 fontconfig-config
@@ -581,9 +548,7 @@ funny-manpages
 fusedav
 fuseiso
 fuseiso9660
-fusesmb
 fuse-utils
-fvwm
 fwlogwatch
 fxload
 g++
@@ -599,7 +564,6 @@ geeqie
 gems
 genders
 genext2fs
-geresh
 getmail4
 gettext
 gettext-el
@@ -631,7 +595,6 @@ gnupg
 gnupg2
 gnupg-agent
 gnutls-bin
-gocr
 gpart
 gparted
 gpgsm
@@ -639,12 +602,12 @@ gpgv
 gphoto2
 gpm
 gptsync
-gq
 grabc
 graphviz
 grep
 grepmail
 groff
+grub-imageboot
 gsfonts
 gsfonts-x11
 gsm-utils
@@ -653,11 +616,8 @@ guessnet
 guymager
 gv
 gzrt
-hal
-hal-info
 haproxy
 harden-tools
-hasciicam
 hdapsd
 hddtemp
 hexedit
@@ -681,6 +641,9 @@ htop
 httperf
 httping
 httptunnel
+hunspell
+hunspell-en-us
+hunspell-de-de
 hunt
 hwdata
 hwloc
@@ -688,15 +651,12 @@ i2c-tools
 i3-wm
 i810switch
 ibod
-ibritish
-icecast2
 iceweasel
 icheck
 icmpush
 id3
 id3v2
 idesk
-idswakeup
 ifenslave-2.6
 ifmetric
 ifrename
@@ -707,7 +667,6 @@ ifupdown-extra
 ihu
 ii
 iisemulator
-ike-scan
 imagemagick
 imapcopy
 imapfilter
@@ -720,7 +679,6 @@ indent
 infiniband-diags
 info
 info2www
-ingerman
 ink
 inotail
 inoticoming
@@ -753,11 +711,9 @@ irqbalance
 irssi
 irssi-plugin-xmpp
 irssi-scripts
-isakmpd
 iscsitarget
 isdnutils-base
 isdnvboxclient
-ispell
 isync
 itop
 ivtv-utils
@@ -765,7 +721,6 @@ iw
 iwatch
 jack
 jackd
-jail
 jailer
 jed
 jed-common
@@ -774,15 +729,12 @@ jfsutils
 jhead
 jigit
 jigl
-jikes
 joe
 john
 joystick
 jp2a
 juke
-jwm
 kanif
-kbd-compat
 keepalived
 kernel-package
 ketchup
@@ -795,7 +747,6 @@ knockd
 knocker
 konwert
 kpartx
-kqemu-common
 krb5-config
 krb5-user
 ksh
@@ -809,7 +760,6 @@ ldap-utils
 ldapvi
 lde
 ldnsutils
-ld.so.preload-manager
 leave
 lft
 lftp
@@ -821,7 +771,6 @@ libsmbios-bin
 libtool
 lighttpd
 lilo
-linda
 links
 links2
 lintian
@@ -829,14 +778,12 @@ linuxdoc-tools
 linuxlogo
 linux-sound-base
 listadmin
-lkl
 lltag
 lm-sensors
 loadlin
 localepurge
 locales
 lockfile-progs
-loco
 log2mail
 logapp
 login
@@ -900,18 +847,15 @@ menu
 menu-xdg
 mercurial
 mesa-utils
-metamail
 mg
 migrationtools
 mii-diag
 mikmod
 mime-support
 minicom
-mirrordir
 mixmaster
 mkcue
 mkelfimage
-mkisofs
 mklibs-copy
 mknbi
 mksh
@@ -922,13 +866,10 @@ modem-cmd
 module-assistant
 molly-guard
 monit
-moosic
 moreutils
 most
 mount
 mp
-mp3blaster
-mp3c
 mp3gain
 mp3info
 mp3splt
@@ -938,21 +879,17 @@ 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
@@ -961,7 +898,6 @@ mutt
 muttprofile
 mysql-client
 mysql-common
-naim
 nano
 nasm
 nast
@@ -978,7 +914,6 @@ ncurses-term
 ndisc6
 ndiswrapper-utils-1.9
 ne
-nedit
 netbase
 netcat
 netcat6
@@ -1004,7 +939,6 @@ nfs-kernel-server
 nfswatch
 nginx
 ngrep
-nictools-nopci
 nictools-pci
 nikto
 nilfs2-tools
@@ -1013,7 +947,6 @@ nmap
 normalize-audio
 noshell
 nsd
-nstx
 ntfs-3g
 ntfsprogs
 ntlmaps
@@ -1083,21 +1016,13 @@ pcaputils
 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
@@ -1116,7 +1041,6 @@ piuparts
 pkg-config
 pktstat
 playmidi
-playmp3list
 plptools
 pmailq
 pmount
@@ -1126,7 +1050,6 @@ pnputils
 po-debconf
 podget
 podracer
-policyrcd-script-zg2
 polipo
 pop3browser
 poppler-utils
@@ -1136,7 +1059,6 @@ portsentry
 posh
 poster
 postfix
-postfix-ldap
 postfix-pcre
 postgresql-client
 postmark
@@ -1144,7 +1066,6 @@ powermgmt-base
 powernowd
 powertop
 pperl
-ppmd
 ppp
 pppconfig
 pppoe
@@ -1166,15 +1087,15 @@ proxychains
 proxycheck
 psad
 pscan
-psh
 psmisc
 pssh
-pstack
 pstotext
 psutils
 pterm
 ptunnel
 pump
+puppet
+puppetmaster
 pv
 pwgen
 pwman3
@@ -1185,22 +1106,18 @@ 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-pycallgraph
@@ -1226,12 +1143,8 @@ racoon
 radeontool
 radio
 radvd
-rain
 rake
 randomize-lines
-ras
-ratmenu
-ratpoison
 rats
 rblcheck
 rc
@@ -1245,7 +1158,6 @@ read-edid
 readline-common
 readpst
 realpath
-realtime-lsm
 recode
 recordmydesktop
 recover
@@ -1258,7 +1170,6 @@ renameutils
 reniced
 reportbug
 reprepro
-retty
 rinetd
 rinse
 rkhunter
@@ -1266,7 +1177,6 @@ rlwrap
 rng-tools
 rofs
 root-tail
-router-audit-tool
 rox-filer
 rpl
 rpm
@@ -1285,10 +1195,8 @@ rutilt
 rxvt-beta
 rxvt-unicode
 s3cmd
-s3switch
 safecopy
 saidar
-sam
 samba
 samba-common
 samdump2
@@ -1311,7 +1219,6 @@ scrot
 scrounge-ntfs
 scsitools
 sdate
-sdd
 sdparm
 secure-delete
 secvpn
@@ -1323,7 +1230,6 @@ sensord
 ser2net
 setcd
 setserial
-sfind
 sformat
 sg3-utils
 sgml-base
@@ -1333,7 +1239,6 @@ sgrep
 shaperd
 shared-mime-info
 sharutils
-shc
 shorewall
 shtool
 sic
@@ -1343,7 +1248,6 @@ sip-tester
 sitecopy
 sl
 slapd
-slat
 slay
 sleepd
 sleepenh
@@ -1355,7 +1259,6 @@ slrnpull
 slsh
 slurm
 sm
-smake
 smartmontools
 smbc
 smbclient
@@ -1367,7 +1270,6 @@ sn
 snarf
 sniffit
 snmp
-snoopy
 socat
 sox
 sp
@@ -1378,7 +1280,6 @@ speedometer
 speex
 spell
 spellutils
-spicctrl
 splint
 sqlite
 sqlite3
@@ -1397,8 +1298,6 @@ ssl-cert
 ssldump
 sslscan
 ssmping
-star
-starttls
 statgrab
 statserial
 stealth
@@ -1417,7 +1316,6 @@ super
 supercat
 sux
 swaks
-swapd
 swatch
 swish++
 symlinks
@@ -1437,7 +1335,6 @@ taktuk
 tar
 tart
 tcc
-tcl8.3
 tcl8.4
 tcng
 tcpd
@@ -1473,6 +1370,7 @@ tin
 tinyhoneypot
 tk8.4
 tmpreaper
+tmux
 tn5250
 tnef
 tofrodos
@@ -1481,7 +1379,6 @@ tor
 tpconfig
 tpp
 t-prot
-tra
 traceroute
 transfig
 trayer
@@ -1490,12 +1387,9 @@ treil
 trickle
 tshark
 tsocks
-tss
 ttf-dejavu
-ttmkfdir
 ttysnoop
 tweak
-twm
 twolame
 txt2man
 txt2pdbdoc
@@ -1533,7 +1427,6 @@ usb-modeswitch
 usbview
 userinfo
 user-setup
-uswsusp
 util-linux
 util-linux-locales
 uudeview
@@ -1541,7 +1434,6 @@ v4l-conf
 vbetool
 vbindiff
 vblade
-vcdtools
 vde2
 vera
 vfu
@@ -1572,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
@@ -1606,20 +1493,15 @@ wireshark-common
 wmaloader
 wmctrl
 wmii
-wmmisc
 wondershaper
-wprint
 wput
 wvdial
 wwwconfig-common
-wyrd
 x11-common
 x11vnc
 x86info
-xar
 xautolock
 xautomation
-xaw3dg
 xawtv
 xawtv-plugins
 xbacklight
@@ -1693,36 +1575,31 @@ 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
 zsh-doc
-zsh-static
 zssh
 zsync
 zzuf
 ## }}}
 
 ## non-free {{{
-abs-guide
 agrep
 atmel-firmware
 bluez-firmware
@@ -1730,7 +1607,6 @@ firmware-iwlwifi
 firmware-qlogic
 firmware-ralink
 iozone3
-irpas
 lha
 manpages-posix
 netperf
@@ -1744,26 +1620,38 @@ PACKAGES aptitude I386
 
 ## general:
 grml
-perf
+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.35-grml:
-#fglrx-kernel-2.6.35-grml
-iscsitarget-module-2.6.35-grml
-linux-doc-2.6.35-grml
-linux-headers-2.6.35-grml
-linux-image-2.6.35-grml
-#linux-source-2.6.35-grml
-loop-aes-modules-2.6.35-grml
-ndiswrapper-modules-2.6.35-grml
-#nvidia-kernel-2.6.35-grml
-openafs-modules-2.6.35-grml
-speakup-modules-2.6.35-grml
-sysprof-module-2.6.35-grml
-tp-smapi-modules-2.6.35-grml
-virtualbox-ose-guest-modules-2.6.35-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-2.6.35-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 {{{
@@ -1771,24 +1659,24 @@ PACKAGES aptitude AMD64
 
 ## general:
 grml64
-perf
+linux-tools-2.6.36
 
-## current kernel version 2.6.35-grml64:
-#fglrx-kernel-2.6.35-grml64
-iscsitarget-module-2.6.35-grml64
-linux-doc-2.6.35-grml64
-linux-headers-2.6.35-grml64
-linux-image-2.6.35-grml64
-#linux-source-2.6.35-grml
-loop-aes-modules-2.6.35-grml64
-ndiswrapper-modules-2.6.35-grml64
-#nvidia-kernel-2.6.35-grml64
-openafs-modules-2.6.35-grml64
-speakup-modules-2.6.35-grml64
-sysprof-module-2.6.35-grml64
-tp-smapi-modules-2.6.35-grml64
-xtables-addons-modules-2.6.35-grml64
-virtualbox-ose-guest-modules-2.6.35-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