Drop debootstrap from GRML_SMALL, add dns2tcp to grml-medium

diff --git a/etc/grml/fai/config/package_config/GRMLBASE b/etc/grml/fai/config/package_config/GRMLBASE
index 34f9bd6..ecce0d5 100644 (file)
--- a/etc/grml/fai/config/package_config/GRMLBASE
+++ b/etc/grml/fai/config/package_config/GRMLBASE
@@ -51,8 +51,9 @@ lvm2
 mdadm
 multitail
 nfs-common
-openssh-client openssh-server
-pciutils usbutils
+openssh-client
+openssh-server
+pciutils
 postfix
 resolvconf
 rsync
@@ -60,7 +61,8 @@ strace
 syslog-ng
 sysutils
 usbutils
-wireless-tools wpasupplicant
+wireless-tools
+wpasupplicant
 
 PACKAGES aptitude I386 
 powernowd

diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index 59f38b5..c5e8cda 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -39,6 +39,7 @@ diff
 dmidecode
 dmraid
 dmsetup
+dns2tcp
 dosfstools
 dpkg
 dselect
@@ -128,10 +129,11 @@ nfs-common
 ntfsprogs
 ntpdate
 nvi
-openssh-client openssh-server
+openssh-client
+openssh-server
 passwd
 patch
-pciutils usbutils
+pciutils
 ppp
 pppoeconf
 prism54-firmware
@@ -175,6 +177,7 @@ unp
 unzip
 unzoo
 update-inetd
+usbutils
 util-linux
 vlan
 vlock
@@ -183,7 +186,6 @@ wget
 whiptail
 wipe
 wireless-tools
-wireless-tools wpasupplicant
 wpasupplicant
 xfsprogs
 zip

diff --git a/etc/grml/fai/config/package_config/GRML_SMALL b/etc/grml/fai/config/package_config/GRML_SMALL
index a493178..00e765c 100644 (file)
--- a/etc/grml/fai/config/package_config/GRML_SMALL
+++ b/etc/grml/fai/config/package_config/GRML_SMALL
@@ -1,6 +1,5 @@
 PACKAGES aptitude
 
-acpid
 adduser
 agrep
 apt
@@ -31,7 +30,6 @@ ddrescue
 debconf
 debconf-i18n
 debianutils
-debootstrap
 deborphan
 dhcp-client
 dialog
@@ -128,10 +126,11 @@ nfs-common
 ntfsprogs
 ntpdate
 nvi
-openssh-client openssh-server
+openssh-client
+openssh-server
 passwd
 patch
-pciutils usbutils
+pciutils
 ppp
 pppoeconf
 prism54-firmware
@@ -174,6 +173,7 @@ udev
 unp
 unzip
 unzoo
+usbutils
 update-inetd
 util-linux
 vlan
@@ -182,7 +182,6 @@ wget
 whiptail
 wipe
 wireless-tools
-wireless-tools wpasupplicant
 wpasupplicant
 xfsprogs
 zip