change fileserver host

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 17b45c239db7e0b1b0524d9c17861aef07d550ad..f61b2f17f45ed0727070330a0cc8d4d026626663 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -14,21 +14,16 @@
 # limitations under the License.
 
 
-# todo. dunno why, but original bootstrap of timezone is not sticking.
-# fixed manually with:
-# s dpkg-reconfigure tzdata
-# enter 12 then 11.
 
 
 # for bootstrapping a new machine
 
-# to make ssh run better, first run this:
+# in case we need it,
+# to make ssh interactive shell run better, we run this first.
 sudo bash -c 'source /a/c/repos/bash/.bashrc && source /a/exe/ssh-emacs-setup'
 
 
-# see t.org for OS installer notes
-
-# usage: $0 [OPTIONS] HOSTNAME
+# usage: $0 [-r] HOSTNAME
 
 # tips:
 # run any sudo command first so your pass is cached
@@ -75,8 +70,8 @@ fi
 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 || demohost; }; }
+has_p() { treetowl || iank-dev || x2 || frodo || tp || demohost; }
+has_x() { ! { lj || li; }; }
 linode() { lj || li; }
 encrypted() { has_p; }
 
@@ -137,15 +132,14 @@ fi
 install-myqueue
 
 if iank-dev; then
-    desktop=$(ssh root@iankelling.org grep desktop /etc/hosts | grep -o "^.* ")
+    desktop=DESKTOP_DOMAIN # TODO, broken. rethink this next time it's used
     if $bootstrapfs; then
-        # for bootstrapping at a new job:
+        # TODO: broken. need to copy files in this directory too, probably rethink this.
         cp="scp $desktop:"
         # for moving to a new hd, change $cp to move between filesystems
         mkdir -p /a/bin
         chown -R ian:ian /a # probably needs to be removed
         $cp/a/c /a
-        $cp/a/c/bin/{bash-programs-by-ian,distro-begin,distro-functions,input-setup.sh} /a/bin
         echo -e \\n\\n\\n | ssh-keygen -t rsa
     fi
 fi
@@ -219,7 +213,7 @@ lnf ${opts[@]} "$1" /home/traci/$2
 EOF
 }
 
-for x in /a/c/repos/bash/!(.git); do
+for x in /a/c/repos/bash/!(.git|..|.); do
     lnf-home "$x"
     sudo -i <<EOF
 PATH="/a/exe:$PATH"
@@ -575,7 +569,7 @@ s chown ian:ian  "${dirs[@]}"
 
 if [[ $HOSTNAME == treetowl ]]; then
     tu /etc/fstab <<'EOF'
-UUID=3f7b31cd-f299-40b4-a86b-7604282e2715 /i btrfs  noatime    0 2
+/dev/disk/by-id/ata-TOSHIBA_MD04ACA500_84REK6NTFS9A-part1 /i btrfs  noatime,subvol=i  0 0
 EOF
 else
     tu /etc/fstab <<'EOF'
@@ -588,17 +582,17 @@ tu /etc/fstab <<'EOF'
 /i/k  /k  none  bind  0 0
 EOF
 
-if ! mountpoint /kfrodo; then
-    s mkdir -p /kfrodo
-    s chown ian:traci /kfrodo
+if ! mountpoint /kr; then
+    s mkdir -p /kr
+    s chown ian:traci /kr
 fi
-if [[ $HOSTNAME == frodo ]]; then
+if [[ $HOSTNAME == treetowl ]]; then
     tu /etc/fstab <<'EOF'
-/k  /kfrodo  none  bind  0 0
+/k  /kr  none  bind  0 0
 EOF
 else
     tu /etc/fstab <<'EOF'
-frodo:/k  /kfrodo  nfs  defaults  0 0
+treetowl:/k  /kr  nfs  defaults  0 0
 EOF
 fi
 
@@ -700,6 +694,24 @@ if isubuntu; then
     s dd of=/etc/default/apport <<<'enabled=0'
 fi
 
+# fai sets this an old way that doesn't work for stretch.
+# no harm in setting it universally here.
+# using debconf-set-selection, the area gets reset to ETC
+# on my linode test machine after doing a dpkg-reconfigure, or a reinstall,
+# so we are using expect :(
+s apt-get -y install --no-install-recommends expect
+s expect <<EOF
+set force_conservative 0
+spawn dpkg-reconfigure tzdata -freadline
+expect -nocase timeout {exit 1} "Geographic area:"
+send "12\r"
+expect -nocase timeout {exit 1} "Time zone:"
+send "11\r"
+expect eof
+exit
+EOF
+
+
 if has_x; then
     if isarch; then
         # install so it's build dependencies don't get removed.
@@ -736,11 +748,11 @@ if has_x; then
             dir=/etc/gdm
         fi
         s mkdir -p $dir/PostLogin
-        s command cp /a/bin/desktop-20-autostart.sh $dir/PostLogin/Default
+        s command cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
         s mkdir /etc/lightdm/lightdm.conf.d
         s dd of=/etc/lightdm/lightdm.conf.d/12-ian.conf <<'EOF'
 [SeatDefaults]
-session-setup-script=/a/bin/desktop-20-autostart.sh
+session-setup-script=/a/bin/distro-setup/desktop-20-autostart.sh
 EOF
     fi
 
@@ -767,7 +779,11 @@ EOF
         for homedir in /home/*; do
             cp /etc/X11/xinit/xinitrc $homedir/.xinitrc
             sed -ri '/^ *twm\b/,$d' $homedir/.xinitrc
-            echo "source /a/bin/xinitrc" | tee -a $homedir/.xinitrc
+            tee -a $homedir/.xinitrc <<'EOF'
+/a/bin/desktop-20-autostart.sh
+xsetroot -cursor_name left_ptr
+exec xmonad
+EOF
         done
     else
         pi suckless-tools
@@ -779,6 +795,6 @@ EOF
     fi
 fi
 
-# the first pup command can kill off our /etc/
-/a/bin/ssh-emacs-setup
+# the first pup command can kill off our /etc/ mod, so rerun this
+/a/exe/ssh-emacs-setup
 echo "$0: $(date): ending now"