X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_XL;h=f5e17708540cc08554b99789f36802c893c56b4b;hp=4312ae9b70d57a4f7d4feb37c5b8cec4798f721e;hb=eacb0a95ee3a408d440a1f8ed4e1dcd8e01d2b10;hpb=e1719d6cc8aef0f7f37418d26430aa6f5ef43594

diff --git a/etc/grml/fai/config/package_config/GRML_XL b/etc/grml/fai/config/package_config/GRML_XL
index 4312ae9..f5e1770 100644
--- a/etc/grml/fai/config/package_config/GRML_XL
+++ b/etc/grml/fai/config/package_config/GRML_XL
@@ -90,7 +90,6 @@ arp-scan
 arptables
 arpwatch
 array-info
-arrayprobe
 ascii
 ascii2binary
 asciidoc
@@ -199,6 +198,7 @@ cgdb
 chkrootkit
 chntpw
 chrootuid
+cifs-utils
 clamav
 clamav-base
 clamav-daemon
@@ -441,7 +441,7 @@ funny-manpages
 fusedav
 fuseiso
 fuseiso9660
-fuse-utils
+fuse
 fwlogwatch
 fxload
 gaffitter
@@ -491,7 +491,6 @@ gpgsm
 gpgv
 gphoto2
 gpm
-gptsync
 grabc
 graphviz
 grep
@@ -544,7 +543,7 @@ icmpush
 id3
 id3v2
 idesk
-ifenslave-2.6
+ifenslave
 ifmetric
 ifrename
 ifstat
@@ -687,7 +686,7 @@ luasocket
 luvcview
 lwatch
 lxc
-lynx
+lynx-cur
 lzma
 lzop
 m17n-db
@@ -702,7 +701,6 @@ mailfilter
 mailplate
 mairix
 make
-makedev
 makejail
 makepasswd
 man-db
@@ -1019,7 +1017,6 @@ readpst
 realpath
 recode
 recordmydesktop
-recover
 recoverjpeg
 redir
 reiser4progs
@@ -1122,7 +1119,6 @@ sm
 smartmontools
 smbc
 smbclient
-smbfs
 smbldap-tools
 smb-nat
 smbnetfs
@@ -1174,7 +1170,6 @@ symlinks
 synergy
 syrep
 sysfsutils
-syslinux
 sysprof
 sysstat
 systune
@@ -1248,7 +1243,6 @@ ucf
 udftools
 udpcast
 udptunnel
-ufsutils
 ulogd
 uml-utilities
 unace
@@ -1426,20 +1420,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 {{{
@@ -1459,9 +1445,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
@@ -1473,9 +1459,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