lots of fixes for trisquel flidas

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 0e61f2b4768840e9834066bed09eb0c39eb9cfd2..904bc7908efb4b3a9203ad8a40676922a6f1ffe1 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -65,10 +65,10 @@ if [[ $1 ]]; then
     export HOSTNAME=$1
 fi
 
-for f in iank-dev htpc treetowl x2 frodo tp li lj demohost; do
+for f in iank-dev htpc treetowl x2 frodo tp li lj demohost kw; do
     eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
-has_p() { treetowl || x2 || frodo || tp || demohost; }
+has_p() { ! linode; } # when tp is tracis, then not tp either
 has_x() { ! linode; }
 linode() { lj || li; }
 has_btrfs() { ! linode; }
@@ -277,11 +277,6 @@ pi trash-cli
 ###### link files ###########
 # convenient to just do all file linking in one place
 
-# if it wasn't set already, we could set hostname here
-#echo treetowl | s dd of=/etc/hostname
-#s hostname -F /etc/hostname
-#HOSTNAME=$(hostname)
-
 
 s lnf -T /a/bin /b
 s lnf -T /nocow/t /t
@@ -564,7 +559,7 @@ if home_network; then
 EOF
     else
         tu /etc/fstab <<'EOF'
-treetowl:/k  /kr  nfs  noauto  0 0
+frodo:/k  /kr  nfs  noauto  0 0
 EOF
     fi
 fi
@@ -802,3 +797,4 @@ fi
 # the first pup command can kill off our /etc/ mod, so rerun this
 /a/exe/ssh-emacs-setup
 echo "$0: $(date): ending now"
+exit 0