X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fpackage_config%2FGRML_FULL;h=2610e1aa7454f8d5feb057989ced4797c918151c;hb=6cf8b10d727038adbd3f00e41c1ffa9542ff30e6;hp=15008849a1ebba7862c1d236b8024337bf6632a8;hpb=4a0e1513266996a43f50a9b8cd2680b3409786e5;p=grml-live.git

diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 1500884..2610e1a 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -1,34 +1,18 @@
 PACKAGES aptitude
 
-atftp
-cpp
-dstat
-facter
-git
 grml-debugtools
 grml-feedback
 grml-live
 grml-paste
 grml-quickconfig-standard
 grml-terminalserver
-ipcalc
-makedev
-mcollective
-passwd
-apg
-pwgen
-sipcalc
-snmp
 squashfs-lzma-tools
-subversion
-tzdata
-util-linux
-whois
 
 # base os
 apt
 binfmt-support
 dbus
+dstat
 findutils
 htop
 libnss-myhostname
@@ -36,15 +20,20 @@ localepurge
 locales
 lsb-release
 lsof
+makedev
 mount
+multitail
 ntp
 ntpdate
 nullmailer
+passwd
 procps
 psmisc
 sudo
 sysvinit
 sysvinit-utils
+tzdata
+util-linux
 
 # basic accessibility
 brltty
@@ -96,6 +85,7 @@ wipe
 # editors
 nano
 vim
+zile
 
 # filesystem support
 acl
@@ -118,6 +108,10 @@ clamav-base
 clamav-freshclam
 mtools
 
+# generic tools
+cpp
+whois
+
 # install linux
 cdebootstrap
 crosshurd
@@ -131,6 +125,7 @@ iscsitarget
 tgt
 
 # networking
+atftp
 avahi-daemon
 bind9-host
 bridge-utils
@@ -144,6 +139,7 @@ firmware-iwlwifi
 firmware-ralink
 firmware-realtek
 ifupdown
+ipcalc
 iproute
 iptraf
 iputils-arping
@@ -155,6 +151,8 @@ netbase
 netcat-openbsd
 net-tools
 nmap
+sipcalc
+snmp
 socat
 ssh
 tcpdump
@@ -183,6 +181,14 @@ unp
 unzip
 zip
 
+# password generators
+apg
+pwgen
+
+# popular VCS to pull config from
+git
+subversion
+
 # recovery
 afflib-tools
 autopsy
@@ -221,6 +227,10 @@ sed
 tmux
 zsh
 
+# system info/mgmt
+facter
+mcollective
+
 # virtualization support
 imvirt
 qemu-kvm
@@ -262,10 +272,10 @@ usbview
 # kernels
 
 PACKAGES aptitude I386
-linux-image-3.1.0-grml
+linux-image-3.1.0-1-grml-686-pae
 
 PACKAGES aptitude AMD64
-linux-image-3.1.0-grml64
+linux-image-3.1.0-1-grml-amd64
 
 PACKAGES aptitude AMD64
 ia32-libs