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 a1bf83a23f5e210b9f7ca0c52e571c3815187fc7..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
@@ -31,16 +34,12 @@ xz-utils
 # ian standard packages
 # lsof is used in my btrfs util scritps.
 # netcat is used for proxy.
-# resolvconf because if we don't install it now we have to reboot for it to
-# take effect. This is explained when you do dpkg-reconfigure resolvconf,
-# and may be fixed in future releases
 keyutils
 cryptsetup
 btrfs-progs
 sudo
 bridge-utils
 netcat-openbsd
-resolvconf
 lsof
 debconf-utils
 file
@@ -59,10 +58,24 @@ apt-transport-https
 # ifupdown because etiona doesnt have it by default
 # and fai scripts want to call ifquery.
 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