X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_XL;h=560119fdc4c5725026b6dba8e70efb40a5589ef1;hp=6f1ca7093edd320b2d74fdb9855f263e87e761f9;hb=35e2f8fec198b91e509858008ad02fa377c74c65;hpb=637a57eaceba3cea6ba1b85323abfef1bf029de6

diff --git a/etc/grml/fai/config/package_config/GRML_XL b/etc/grml/fai/config/package_config/GRML_XL
index 6f1ca70..560119f 100644
--- a/etc/grml/fai/config/package_config/GRML_XL
+++ b/etc/grml/fai/config/package_config/GRML_XL
@@ -18,7 +18,6 @@ PACKAGES aptitude
 ## grml specific packages {{{
 grml-debugtools
 grml-desktop
-grml-feedback
 grml-live
 grml-paste
 grml-quickconfig-standard
@@ -91,7 +90,6 @@ arp-scan
 arptables
 arpwatch
 array-info
-arrayprobe
 ascii
 ascii2binary
 asciidoc
@@ -200,6 +198,7 @@ cgdb
 chkrootkit
 chntpw
 chrootuid
+cifs-utils
 clamav
 clamav-base
 clamav-daemon
@@ -442,7 +441,7 @@ funny-manpages
 fusedav
 fuseiso
 fuseiso9660
-fuse-utils
+fuse
 fwlogwatch
 fxload
 gaffitter
@@ -545,7 +544,7 @@ icmpush
 id3
 id3v2
 idesk
-ifenslave-2.6
+ifenslave
 ifmetric
 ifrename
 ifstat
@@ -703,7 +702,6 @@ mailfilter
 mailplate
 mairix
 make
-makedev
 makejail
 makepasswd
 man-db
@@ -1020,7 +1018,6 @@ readpst
 realpath
 recode
 recordmydesktop
-recover
 recoverjpeg
 redir
 reiser4progs
@@ -1123,7 +1120,6 @@ sm
 smartmontools
 smbc
 smbclient
-smbfs
 smbldap-tools
 smb-nat
 smbnetfs
@@ -1249,7 +1245,6 @@ ucf
 udftools
 udpcast
 udptunnel
-ufsutils
 ulogd
 uml-utilities
 unace
@@ -1427,20 +1422,12 @@ zzuf
 
 ## non-free {{{
 agrep
-atmel-firmware
-bluez-firmware
-firmware-brcm80211
-firmware-iwlwifi
-firmware-qlogic
-firmware-ralink
-firmware-realtek
 iozone3
 lha
 manpages-posix
 netperf
 python-profiler
 unrar
-zd1211-firmware
 ## }}}
 
 ## kernel-version dependent packages {{{
@@ -1460,9 +1447,9 @@ fnfxd
 pstack
 retty
 
-## current kernel version 3.1.0-grml:
+## current kernel version:
 #iscsitarget-module-3.1.0-grml
-linux-image-3.1.0-2-grml-486
+linux-image-i386-grml
 #ndiswrapper-modules-3.1.0-grml
 #openafs-modules-3.1.0-grml
 #sysprof-module-3.1.0-grml
@@ -1474,9 +1461,9 @@ linux-image-3.1.0-2-grml-486
 ## amd64 specific packages {{{
 PACKAGES aptitude AMD64
 
-## current kernel version 3.1.0-grml64:
+## current kernel version:
 #iscsitarget-module-3.1.0-grml64
-linux-image-3.1.0-2-grml-amd64
+linux-image-amd64-grml
 #ndiswrapper-modules-3.1.0-grml64
 #openafs-modules-3.1.0-grml64
 #sysprof-module-3.1.0-grml64