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=22e07141b54dc87ecf4f01f97e7ad9ff673fa1eb;hb=c00baf7aa8540f934fba232708020db0316fc576;hpb=73bfef133f92512ae395929e93f3cac1ebdbe200

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 22e0714..5c8d3df 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -48,6 +48,7 @@ grml-live
 grml-paste
 grml-pylib
 grml-quickconfig-standard
+grml-rescueboot
 grml-sectools
 grml-templates
 grml-terminalserver
@@ -79,7 +80,6 @@ shish
 shmux
 sitar
 smap
-speechd-up
 sudosh
 svn-ssh-wrappers
 tal
@@ -87,7 +87,6 @@ texttools-doc
 thc-ipv6
 thinkfinger-tools
 upgrade-oldest
-zfs-fuse
 zsh-lovers
 ## }}}
 
@@ -201,7 +200,6 @@ base-passwd
 bash
 bash-builtins
 bash-doc
-bash-static
 bastille
 bb
 bbe
@@ -243,7 +241,6 @@ bsd-mailx
 bsdmainutils
 bsdtar
 bsdutils
-bsign
 btrfs-tools
 btscanner
 buffer
@@ -252,7 +249,6 @@ burn
 bvi
 bwm-ng
 c3270
-cabber
 cabextract
 caca-utils
 ca-certificates
@@ -278,7 +274,6 @@ cdrskin
 cedet-common
 centerim-utf8
 cereal
-cfengine2
 cfv
 cgdb
 chkrootkit
@@ -501,6 +496,7 @@ fai-client
 fai-doc
 fail2ban
 fai-server
+fai-setup-storage
 fake
 fakeroot
 faketime
@@ -552,7 +548,6 @@ funny-manpages
 fusedav
 fuseiso
 fuseiso9660
-fusesmb
 fuse-utils
 fwlogwatch
 fxload
@@ -600,7 +595,6 @@ gnupg
 gnupg2
 gnupg-agent
 gnutls-bin
-gocr
 gpart
 gparted
 gpgsm
@@ -613,6 +607,7 @@ graphviz
 grep
 grepmail
 groff
+grub-imageboot
 gsfonts
 gsfonts-x11
 gsm-utils
@@ -621,11 +616,8 @@ guessnet
 guymager
 gv
 gzrt
-hal
-hal-info
 haproxy
 harden-tools
-hasciicam
 hdapsd
 hddtemp
 hexedit
@@ -659,7 +651,6 @@ i2c-tools
 i3-wm
 i810switch
 ibod
-icecast2
 iceweasel
 icheck
 icmpush
@@ -676,7 +667,6 @@ ifupdown-extra
 ihu
 ii
 iisemulator
-ike-scan
 imagemagick
 imapcopy
 imapfilter
@@ -721,7 +711,6 @@ irqbalance
 irssi
 irssi-plugin-xmpp
 irssi-scripts
-isakmpd
 iscsitarget
 isdnutils-base
 isdnvboxclient
@@ -732,7 +721,6 @@ iw
 iwatch
 jack
 jackd
-jail
 jailer
 jed
 jed-common
@@ -790,7 +778,6 @@ linuxdoc-tools
 linuxlogo
 linux-sound-base
 listadmin
-lkl
 lltag
 lm-sensors
 loadlin
@@ -866,7 +853,6 @@ mii-diag
 mikmod
 mime-support
 minicom
-mirrordir
 mixmaster
 mkcue
 mkelfimage
@@ -880,13 +866,10 @@ modem-cmd
 module-assistant
 molly-guard
 monit
-moosic
 moreutils
 most
 mount
 mp
-mp3blaster
-mp3c
 mp3gain
 mp3info
 mp3splt
@@ -896,13 +879,12 @@ mpc
 mpg123-alsa
 mpg321
 mplayer
-mplayer-skin-blue
 mpt-status
 mr
 mrb
 msmtp
 msort
-mtd-tools
+mtd-utils
 mtools
 mtpaint
 mtp-tools
@@ -965,7 +947,6 @@ nmap
 normalize-audio
 noshell
 nsd
-nstx
 ntfs-3g
 ntfsprogs
 ntlmaps
@@ -1035,7 +1016,6 @@ pcaputils
 pcmciautils
 pconf-detect
 pconsole
-pcopy
 pcregrep
 pcscd
 pdfcube
@@ -1070,7 +1050,6 @@ pnputils
 po-debconf
 podget
 podracer
-policyrcd-script-zg2
 polipo
 pop3browser
 poppler-utils
@@ -1080,7 +1059,6 @@ portsentry
 posh
 poster
 postfix
-postfix-ldap
 postfix-pcre
 postgresql-client
 postmark
@@ -1109,15 +1087,15 @@ proxychains
 proxycheck
 psad
 pscan
-psh
 psmisc
 pssh
-pstack
 pstotext
 psutils
 pterm
 ptunnel
 pump
+puppet
+puppetmaster
 pv
 pwgen
 pwman3
@@ -1165,10 +1143,8 @@ racoon
 radeontool
 radio
 radvd
-rain
 rake
 randomize-lines
-ras
 rats
 rblcheck
 rc
@@ -1194,7 +1170,6 @@ renameutils
 reniced
 reportbug
 reprepro
-retty
 rinetd
 rinse
 rkhunter
@@ -1222,7 +1197,6 @@ rxvt-unicode
 s3cmd
 safecopy
 saidar
-sam
 samba
 samba-common
 samdump2
@@ -1245,7 +1219,6 @@ scrot
 scrounge-ntfs
 scsitools
 sdate
-sdd
 sdparm
 secure-delete
 secvpn
@@ -1266,7 +1239,6 @@ sgrep
 shaperd
 shared-mime-info
 sharutils
-shc
 shorewall
 shtool
 sic
@@ -1276,7 +1248,6 @@ sip-tester
 sitecopy
 sl
 slapd
-slat
 slay
 sleepd
 sleepenh
@@ -1299,7 +1270,6 @@ sn
 snarf
 sniffit
 snmp
-snoopy
 socat
 sox
 sp
@@ -1328,7 +1298,6 @@ ssl-cert
 ssldump
 sslscan
 ssmping
-starttls
 statgrab
 statserial
 stealth
@@ -1347,7 +1316,6 @@ super
 supercat
 sux
 swaks
-swapd
 swatch
 swish++
 symlinks
@@ -1402,6 +1370,7 @@ tin
 tinyhoneypot
 tk8.4
 tmpreaper
+tmux
 tn5250
 tnef
 tofrodos
@@ -1410,7 +1379,6 @@ tor
 tpconfig
 tpp
 t-prot
-tra
 traceroute
 transfig
 trayer
@@ -1419,7 +1387,6 @@ treil
 trickle
 tshark
 tsocks
-tss
 ttf-dejavu
 ttysnoop
 tweak
@@ -1460,7 +1427,6 @@ usb-modeswitch
 usbview
 userinfo
 user-setup
-uswsusp
 util-linux
 util-linux-locales
 uudeview
@@ -1498,7 +1464,6 @@ vtun
 w3m
 w3m-el
 w3m-img
-wacom-tools
 wajig
 wakeonlan
 wamerican-small
@@ -1509,7 +1474,6 @@ wdiff
 webcam
 webcamd
 webcheck
-webcpp
 weblint-perl
 weechat
 weechat-curses
@@ -1536,7 +1500,6 @@ wwwconfig-common
 x11-common
 x11vnc
 x86info
-xar
 xautolock
 xautomation
 xawtv
@@ -1612,7 +1575,6 @@ xutils
 xutils-dev
 xvfb
 xvkbd
-xvncviewer
 xwit
 xzoom
 xz-utils
@@ -1624,6 +1586,7 @@ yersinia
 youtube-dl
 zec
 zerofree
+zfs-fuse
 zgv
 zile
 zip
@@ -1631,14 +1594,12 @@ zoidberg
 zoo
 zsh
 zsh-doc
-zsh-static
 zssh
 zsync
 zzuf
 ## }}}
 
 ## non-free {{{
-abs-guide
 agrep
 atmel-firmware
 bluez-firmware
@@ -1664,8 +1625,11 @@ linux-tools-2.6.36
 # i386-only software
 athcool
 atitvout
+bsign
 fnfx-client
 fnfxd
+pstack
+retty
 s3switch
 spicctrl