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 95086d0ceb15baed0be08d76900f2356675c4069..c0726e67b696d928b082d1faaa5df3d5d751c340 100644 (file)
--- a/fai/config/package_config/STANDARD
+++ b/fai/config/package_config/STANDARD
@@ -21,7 +21,7 @@ ncurses-term
 openssh-client
 pciutils
 perl
-# newer distros dont have python, it gets naturally removed
+# ian: newer distros dont have python, it gets naturally removed
 python
 python-minimal
 python3
@@ -34,6 +34,7 @@ xz-utils
 # ian standard packages
 # lsof is used in my btrfs util scritps.
 # netcat is used for proxy.
+lvm2
 keyutils
 cryptsetup
 btrfs-progs
@@ -64,14 +65,16 @@ 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
-
-PACKAGES install NABIA FOCAL
+# 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 dosfstools