X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=README;h=4bbcc87018079be31b6f0a1c59398c8dbd814733;hp=95eca1d4f00fce3ddcc1116e37e17964aa87dd75;hb=1b08e82a978c8db76e1ebc67f3b4ae875ba27537;hpb=dcc5f68f7fbe9aa86cb3c7402ba4429bd70b369d

diff --git a/README b/README
index 95eca1d..4bbcc87 100644
--- a/README
+++ b/README
@@ -140,9 +140,6 @@ fresize # resize swap or boot partitions in a host
 
 # Replacing a raid 10 disk
 
-# i expect better results with newer kernel and btrfs progs than the default stretch
-fai-server buster
-
 pxe-server -S HOST fai
 
 # btrfs replace or delete. prefer replace. to setup partitions on replacement drive:
@@ -180,6 +177,14 @@ reboot
 
 # Expected output in fai logs
 
+On focal,
+fai.log:updatebase.UBUNTU    FAILED with exit code 1.
+the real error is dpkg-reconfigure locales, seems to be related
+to a workaround for < 20.04, relevant comment:
+# in case the locales are already included inside the base file (Ubuntu)
+in config/hooks/instsoft.DEBIAN
+
+
 For flidas, when installing systemd, this error happens, and it's
 a superflous upstream bug based on reading the post install script:
 
@@ -281,6 +286,13 @@ umount dev
 umount sys
 reboot
 
+# for switching the boot to root2
+zboot
+# for switching back, efibootmgr, if there is a problem with the root filesystem detection,
+# boot into the debian bootstrap distro, run partition.DEFAULT using comments for mktab arg.
+# then manually run iboot and then reboot.
+
+
 # pine rock64 notes
 # the only useful image is ubuntu 18.04 ayafun or something.
 # using emmc usb:
@@ -295,6 +307,23 @@ s apt-get update
 s apt dist-upgrade
 
 
+### How to merge upstream fai-config
+
+git checkout upstream
+cd path-to-fai-config
+git pull --stat
+# the following needs modification if there was deletions or renames
+rsync --exclude /.git -rlpgoDcvi . /b/fai/fai/config/
+cd /b/fai/fai/config/
+# where XXXXX is the git commit hash
+# note, several files which just had trailing space changes will get ignored.
+git commit -am "update upstream to XXXXX"
+git checkout master
+git merge upstream
+# fix conflicts
+git commit
+
+
 # TODO
 Change arch to archlike and to support arch and parabola