Merge branch 'upstream'

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

diff --git a/fai/config/package_config/STANDARD b/fai/config/package_config/STANDARD
index 02f27b35b5d1712c4174e56f52d9ff543dae1246..413254f958391b5386813a11f4aac0801d047eca 100644 (file)
--- a/fai/config/package_config/STANDARD
+++ b/fai/config/package_config/STANDARD
@@ -21,8 +21,11 @@ ncurses-term
 openssh-client
 pciutils
 perl
+# ian: newer distros dont have python, it gets naturally removed
 python
 python-minimal
+python3
+python3-minimal
 reportbug
 telnet
 traceroute
@@ -57,10 +60,22 @@ apt-transport-https
 ifupdown
 netplan.io-
 libnss-resolve
+publicsuffix
+iso-codes
+# new package buster/nabia+
+cryptsetup-initramfs
+# https://wiki.debian.org/UsrMerge
+usrmerge
+# for btrbk
+zstd
 
 # iank, copied from DEBIAN so it goes into ubuntu too
 PACKAGES install GRUB_PC
 grub-pc
 
 PACKAGES install GRUB_EFI
-grub-efi
+# normally would have just grub-efi
+# but theres a dependency problem with it in nabia: for some reason it depends on
+# a version in security, but theres a later version in updates that the system
+# really wants to install.
+grub-efi-amd64