X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-begin;h=eb51dcbe33fb67d0008357e8bddc203ad6f125f3;hb=a1ebefe19ab910d20fad0c2fd88637fee23dee7c;hp=22fff60409d135d21ae76167ae28e2de5a9df3b5;hpb=929bcfbc41e050d69b48405ac8bb6d03af930d95;p=distro-setup

diff --git a/distro-begin b/distro-begin
index 22fff60..eb51dcb 100755
--- a/distro-begin
+++ b/distro-begin
@@ -55,14 +55,13 @@ if ! $interactive; then
 fi
 source /a/bin/errhandle/err
 
-errcatch-cleanup() {
+err-cleanup() {
   echo 1 >~/.local/distro-begin
 }
 
 source /a/bin/distro-functions/src/package-manager-abstractions
 
 ### setup logging
-exec &> >(sudo tee -a /var/log/distro-begin)
 echo "$0: $(date): starting now)"
 
 
@@ -128,7 +127,7 @@ if encrypted; then
   # but it happened too late in the shutdown process.
   sudo dd of=/etc/systemd/system/keyscripton.service <<'EOF'
 [Unit]
-Description=Turn on automatic decryption of drives on boot
+Description=keyscripton
 # This is triggered by reboot and when keyscriptoff stops.
 
 # tried using graphical.target, but it made my display manager restart before rebooting.
@@ -154,7 +153,7 @@ EOF
 
   sudo dd of=/etc/systemd/system/keyscriptoff.service <<'EOF'
 [Unit]
-Description=Turn off automatic decryption of drives on boot
+Description=keyscriptoff
 
 [Service]
 Type=oneshot
@@ -213,8 +212,13 @@ if [[ $HOSTNAME != $(cat /etc/hostname) ]]; then
   echo $HOSTNAME > /etc/hostname
   hostname -F /etc/hostname
 fi
+# office vpn dhcp adds to /etc/resolv.conf search office.fsf.org which
+# makes that be #1 priority, which makes dnsmasq resolve that for
+# unqualified hosts first, which means we skip the hosts file. Ya, its
+# kinda dumb, but it is what it is. There is a dnsmasq config option to
+# override it too, but this seems simpler.
 sudo sed -i --follow-symlinks -f - /etc/hosts <<EOF
-\$a 127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME
+\$a 127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME.office.fsf.org $HOSTNAME
 /^127\.0\.1\.1/d
 EOF
 
@@ -326,9 +330,9 @@ pi ${p1[@]}
 
 
 ######## fix evbug bug ######
-case $distro in
-  trisquel|ubuntu)
-    # noticed in flidas.
+case $(debian-codename-compat) in
+  xenial)
+    # noticed in flidas. dunno if it affects any others
     #https://bugs.launchpad.net/ubuntu/+source/module-init-tools/+bug/240553
     #https://wiki.debian.org/KernelModuleBlacklisting
     #common advice when searching is to use /etc/modprobe.d/blacklist.conf,
@@ -353,7 +357,7 @@ if has_p; then
   lnf -T /p/News ~/News
 fi
 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/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
 
@@ -544,31 +548,16 @@ if has_x; then
   esac
 
   ##### setup X autostart
-  if isarch; then
-    # https://wiki.archlinux.org/index.php/Xinitrc
-    for homedir in /home/*; do
-      cp /etc/X11/xinit/xinitrc $homedir/.xinitrc
-      # shellcheck disable=SC2016
-      $sed -ri '/^ *twm\b/,$d' $homedir/.xinitrc
-      tee -a $homedir/.xinitrc <<'EOF'
-/a/bin/desktop-20-autostart.sh
-xsetroot -cursor_name left_ptr
-exec xmonad
-EOF
-    done
-  else
-    # todo, figure this out for arch if we ever try out gnome.
-    # install for multiple display managers in case we use one
-    dir=/etc/gdm3
-    sudo mkdir -p $dir/PostLogin
-    sudo cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
-    sudo mkdir -p /etc/lightdm/lightdm.conf.d
-    sudo dd of=/etc/lightdm/lightdm.conf.d/12-iank.conf <<'EOF'
+  # todo, figure this out for arch if we ever try out gnome.
+  # install for multiple display managers in case we use one
+  dir=/etc/gdm3
+  sudo mkdir -p $dir/PostLogin
+  sudo cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
+  sudo mkdir -p /etc/lightdm/lightdm.conf.d
+  sudo dd of=/etc/lightdm/lightdm.conf.d/12-iank.conf <<'EOF'
 [SeatDefaults]
 session-setup-script=/a/bin/distro-setup/desktop-20-autostart.sh
 EOF
-  fi
-
 fi
 
 ### install and configure wayland
@@ -611,4 +600,5 @@ fi
 
 echo 0 >~/.local/distro-begin
 echo "$0: $(date): ending now"
+echo "exiting with status 0"
 exit 0