minor doc update

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 5ffb0d288e3b4cf2fb161deaf19de67dc82bdc4e..a37a19b86006691e1229cd630bdd625795181042 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -72,11 +72,11 @@ if [[ $1 ]]; then
     export HOSTNAME=$1
 fi
 
-for f in iank-dev htpc treetowl x2 frodo tp li lj; do
+for f in iank-dev htpc treetowl x2 frodo tp li lj demohost; do
     eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 has_p() { iank-dev || x2 || frodo || tp; }
-has_x() { ! { lj || li; }; }
+has_x() { ! { lj || li || demohost; }; }
 encrypted() { has_p; }
 
 shopt -s extglob
@@ -263,6 +263,10 @@ EOF
     fi
 fi
 
+s lnf -T /q/p /p
+# this needs to be before installing pacserve so we have gpg conf.
+conflink
+
 if isarch; then
     #https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages
     sudo pacman -S --noconfirm --needed base-devel jq
@@ -282,7 +286,8 @@ if isarch; then
     aurpi cower pacaur
 
     pi pacserve
-    x=$(mktemp); /a/opt/pacman.conf-insert_pacserve >$x
+
+    x=$(mktemp); /usr/bin/pacman.conf-insert_pacserve >$x
     sudo dd of=/etc/pacman.conf if=$x; rm $x
     sudo systemctl enable pacserve.service
     sudo systemctl start pacserve.service
@@ -306,14 +311,8 @@ pi trash-cli
 #s hostname -F /etc/hostname
 #HOSTNAME=$(hostname)
 
-#########################################
-# NOTE: only /a needs to be mounted for creating links!
-###########################################
 
-# todo: reconcile ~/.ssh/config work/home
-s lnf -T /q/p /p
 s lnf -T /a/bin /b
-conflink
 
 if has_p; then
     lnf -T /p/offlineimap ~/Maildir