Merge branch 'upstream'

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

diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN
index 99c4fa04068f926a23392d9802f58ddde160a96a..d3dc95e4052119ce48cb22d3da9aaeb405d7e559 100644 (file)
--- a/fai/config/package_config/DEBIAN
+++ b/fai/config/package_config/DEBIAN
@@ -13,8 +13,16 @@ memtest86+
 PACKAGES install DHCPC
 isc-dhcp-client
 
+# ian: note everything after the grub package should be refactored into
+# a new class.
 PACKAGES install GRUB_PC
-grub-pc mdadm grub-legacy- lilo-
+grub-pc cryptsetup btrfs-tools sudo bridge-utils netcat-openbsd
+
+PACKAGES install GRUB_EFI
+grub-efi cryptsetup btrfs-tools sudo bridge-utils netcat-openbsd
 
 PACKAGES install LVM
 lvm2
+
+PACKAGES install CLOUD
+locales-all