fixes, prometheus, lots of stuff

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index e9699408655ccb6aa4e6a52271937a2edb7b6e09..e2d1a8713dbef07c58956d681244aa565d86463b 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -78,7 +78,10 @@ fi
 
 ### arg parsing
 recompile=false
-emacs=true
+emacs=false
+if [[ -e /a/opt/emacs ]]; then
+  emacs=true
+fi
 while [[ $1 == -* ]]; do
   case $1 in
     -r) recompile=true; shift ;;
@@ -97,7 +100,7 @@ source $script_dir/pkgs
 set +x
 source /a/bin/distro-functions/src/identify-distros
 $interactive || set -x
-for f in kd x2 x3 frodo tp li bk je demohost kw; do
+for f in kd x2 x3 frodo tp li bk je demohost kw sy bo; do
   eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 codename=$(debian-codename)
@@ -233,6 +236,10 @@ sudo sed -i --follow-symlinks -f - /etc/hosts <<EOF
 /^127\.0\.1\.1/d
 EOF
 
+if bitfolk; then
+  sudo systemctl disable systemd-networkd
+fi
+
 ##### exit first stage if running as root
 if [[ $EUID == 0 ]]; then
   echo "$0: running as root. exiting now that users are setup"
@@ -248,6 +255,25 @@ lnf $x /root
 EOF
 done
 
+###### link files
+# convenient to just do all file linking in one place
+sudo /a/exe/lnf -T /a/bin /b
+sudo /a/exe/lnf -T /a/f /f
+sudo /a/exe/lnf -T /var/log/exim4 /el
+sudo /a/exe/lnf -T /a/f/ans /c
+sudo /a/exe/lnf -T /nocow/t /t
+if has_p; then
+  lnf -T /p/News ~/News
+fi
+dirs=(/q/root /q/root/.editor-backups /q/root/.undo-tree-history)
+sudo mkdir -p ${dirs[@]}
+sudo chmod 600 ${dirs[@]}
+sudo /a/exe/lnf /q/root/.editor-backups /q/root/.undo-tree-history \
+     /a/opt /a/c/.emacs.d $HOME/mw_vars /k/backup /root
+/a/bin/ds/install-my-scripts # needed for rootsshsync cronjob
+sudo /a/exe/lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root
+
+
 ###### do conflink
 # vps needs bind group before conflink
 if vps; then
@@ -260,6 +286,8 @@ if [[ -e /etc/rootsudoenv ]]; then
   source /etc/rootsudoenv
 fi
 
+
+
 ###### bash environment setup
 set +x
 err-allow
@@ -428,26 +456,6 @@ case $(debian-codename-compat) in
 esac
 
 
-###### link files
-# convenient to just do all file linking in one place
-sudo /a/exe/lnf -T /a/bin /b
-sudo /a/exe/lnf -T /a/f /f
-sudo /a/exe/lnf -T /var/log/exim4 /el
-sudo /a/exe/lnf -T /a/f/ans /c
-sudo /a/exe/lnf -T /nocow/t /t
-if has_p; then
-  lnf -T /p/News ~/News
-fi
-dirs=(/q/root /q/root/.editor-backups /q/root/.undo-tree-history)
-sudo mkdir -p ${dirs[@]}
-sudo chmod 600 ${dirs[@]}
-sudo /a/exe/lnf /q/root/.editor-backups /q/root/.undo-tree-history \
-     /a/opt /a/c/.emacs.d $HOME/mw_vars /k/backup /root
-/a/bin/ds/install-my-scripts # needed for rootsshsync cronjob
-sudo /a/exe/lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root
-
-
-
 
 #### arch specific early packages
 case $(distro-name) in