fixies for fsf special_disk partitioning

[automated-distro-installer] / fai-redep

diff --git a/fai-redep b/fai-redep
index 5498667df6fd2c148f23b7096401480994f119fc..f893432881e5733c73bfed106639308a1e27063c 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -96,8 +96,6 @@ if ! ip a | grep "^ *inet.\? $faiserver_addr" &>/dev/null; then
   faiserver_shell="ssh -F $HOME/.ssh/confighome root@$faiserver_host"
 fi
 
-# these are gitignored.
-rsync -atL /home/iank/.ssh/authorized_keys fai/config/files/root/.ssh/authorized_keys/STANDARD
 # we hssh and ssh_filter_btrbk for the initial btrbk (alternatively, I could open up the
 # permissions in authorized_keys, but that just seems lazy)
 install --owner=iank --group=iank -d fai/config/files/usr/local/bin/hssh
@@ -129,22 +127,22 @@ else
   rsrv -rlpt /q/root/shadow /q/root/luks /fai/config/distro-install-common
 fi
 
-rsrv -rlpt --delete /a/bin/ds/bash-lib-u /a/opt/btrfs-progs-release /fai/config/distro-install-common
+rsrv -rlpt --delete /a/opt/btrfs-progs-release /a/opt/btrfs-progs /fai/config/distro-install-common
 
 dirs=(/p/c/machine_specific/${target:-*}/filesystem/etc/ssh)
 if [[ -e ${dirs[0]} ]]; then
   rsrv -rlpt --delete --relative ${dirs[@]} /fai/config/distro-install-common
 fi
 
-. /a/bin/distro-setup/pkgs
-tmpstr=$(/a/bin/buildscripts/emacs -p && /a/bin/distro-setup/distro-pkgs $distro)
-declare -a pall
-for p in $tmpstr; do
-  pall+=($p)
-done
-
-printf "%s\n%s\n" "PACKAGES install" ${pall[*]} | \
-  $faiserver_shell dd of=/srv/fai/config/package_config/DESKTOP status=none ||: # broken pipe
-
+# historical notes: once I tried installing all generic packages using
+# the DESKTOP class, and populated the package list here, but it had
+# some problem and figured it was easier to debug if we let fai just
+# handle some basic initial things.
+# I also tried speeding up an initial install by making basefile with
+# lots of packages installed in a script called mk-basefile-big. Many
+# packages fail to install by having debootstrap install extra
+# packages. I tried instead to do a fai dirinstall (fancy chroot) to
+# install packages, then turn that into a new basefile. It had some
+# problem and once again, did not seem worth debugging.
 
 rsrv -rplt --include '/*.zst' --exclude '/**' --delete-excluded $BASEFILE_DIR/ /fai/config/basefiles/