merge upstream, untested

[automated-distro-installer] / fai / config / package_config / UBUNTU

diff --git a/fai/config/package_config/UBUNTU b/fai/config/package_config/UBUNTU
index 4a5a976f5348df8a627e14eb29d01ec19f040868..709311a9a853f606f5043ee2df916579c12c8381 100644 (file)
--- a/fai/config/package_config/UBUNTU
+++ b/fai/config/package_config/UBUNTU
@@ -1,21 +1,18 @@
 PACKAGES install I386
-linux-image-generic initramfs-tools
+linux-image-generic
 memtest86+
 
 PACKAGES install CHROOT
 linux-image-generic-
 
 PACKAGES install AMD64
-linux-image-generic initramfs-tools
+linux-image-generic
 memtest86+
 
-PACKAGES install DHCPC
-isc-dhcp-client
-
 PACKAGES install GRUB_PC
-grub-pc cryptsetup btrfs-tools bridge-utils
+grub-pc cryptsetup btrfs-tools mbuffer bridge-utils netcat-openbsd lsof
 
-PACKAGES aptitude-r XORG
+PACKAGES install XORG
 ubuntu-desktop
 ubuntu-standard
 ubuntu-minimal