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

diff --git a/README b/README
index aeb3957..4bbcc87 100644
--- a/README
+++ b/README
@@ -286,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:
@@ -300,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