X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-begin;h=16d3359d5d8f8579250d9541e14f37479601089d;hp=0744a1b07861d56739d972b77e38181da957b8a6;hb=77917a8fbf2032a8b2634a1b3de0879ec45cf213;hpb=6061d88c7d5beda3e974943eb8676f7c39d4ae9f

diff --git a/distro-begin b/distro-begin
index 0744a1b..16d3359 100755
--- a/distro-begin
+++ b/distro-begin
@@ -46,7 +46,6 @@
 ### make ssh interactive shell run better. for when running line interactively line by line
 sudo bash -c '/a/exe/ssh-emacs-setup'
 
-if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 ##### setup error handling
 interactive=true  # set this to false to force set -x
 [[ $- == *i* ]] || interactive=false
@@ -55,14 +54,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 +126,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 +152,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
@@ -169,15 +167,26 @@ EOF
 
   pi rsync
 
-  # from /usr/share/doc/dropbear-initramfs/README.initramfs.gz
-  tmp=$(mktemp)
-  while read -r m _; do /sbin/modinfo -F filename "$m"; done </proc/modules | \
-    sed -nr "s@^/lib/modules/$(uname -r)/kernel/drivers/net(/.*)?/([^/]+)\.ko\$@\2@p" \
-    | sudo dd of=$tmp
-  if ! diff -q /etc/initramfs-tools/modules $tmp &>/dev/null; then
-    sudo dd if=$tmp of=/etc/initramfs-tools/modules
+  ## /usr/share/doc/dropbear-initramfs/README.initramfs.gz
+  ## claims we need to do this. but it works fine without it.
+  # tmp=$(mktemp)
+  # while read -r m _; do /sbin/modinfo -F filename "$m"; done </proc/modules | \
+    #   sed -nr "s@^/lib/modules/$(uname -r)/kernel/drivers/net(/.*)?/([^/]+)\.ko\$@\2@p" \
+    #   | sudo dd of=$tmp
+  # if ! diff -q /etc/initramfs-tools/modules $tmp &>/dev/null; then
+  #   sudo dd if=$tmp of=/etc/initramfs-tools/modules
+  #   sudo /usr/sbin/update-initramfs -u -k all
+  # fi
+  #
+  ## if we were creating an intall for a different machine needing different modules, we could include them all like this:
+  ## find /lib/modules/*/kernel/drivers/net /lib/modules/*/kernel/net -type f -name '*.ko' -printf "%f\n" | sed 's/.ko$//' | sort -u >/etc/initramfs-tools/modules
+
+  # this is here to cleanup the leftover from the comments above. remove it eventually.
+  if [[ -s /etc/initramfs-tools/modules ]]; then
+    sudo truncate -s0 /etc/initramfs-tools/modules
     sudo /usr/sbin/update-initramfs -u -k all
   fi
+
   # initram auth keys get setup with rootsshsync
   $script_dir/rootsshsync
   # then for remote unlock, ssh and do this once per crypt disk:
@@ -213,8 +222,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 +340,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 +367,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
 
@@ -512,80 +526,53 @@ if tp || x2 || x3; then
   esac
 fi
 
-if has_x; then
+if has_monitor; then
+
+  # sway not packaged for t9, not bothering to build it yet since
+  # i3 doesnt seem to tear and stutter on video anymore.
+  if [[ $codename == buster ]]; then
+    pi sway xwayland
+  fi
+
+
   ###### install X
   pi i3
-  if isarch; then
-    # xorg-xmessage for displaying error messages.
-    # optional dependency in arch, standard elsewhere.
-    pi xorg-server xorg-xmessage xorg-xsetroot xorg-xinit
-  fi
 
   ##### install xinput
   case $(distro-name) in
     trisquel|ubuntu|debian)
       pi xinput
       ;;
-    arch)
-      pi xorg-xinput
-      ;;
   esac
 
-  #### install redshift
-  case $(distro-name) in
-    trisquel|ubuntu|debian)
-      # recommends gets us geoclue (for darkening automatically at night i assume),
-      # which recommends modemmanager, which is annoying to fix for the model01 keyboard.
-      pi --no-install-recommends gtk-redshift
-      ;;&
-    arch)
-      pi redshift
-      ;;&
-  esac
+  # recommends gets us geoclue (for darkening automatically at night i assume),
+  # which recommends modemmanager, which is annoying to fix for the model01 keyboard.
+  pi --no-install-recommends gtk-redshift
 
   ##### 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 command cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
-    sudo mkdir /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
-if has_wayland; then
-  pi sway xwayland
   # originally used xkbcomp, documented in input-setup.sh, this doesnt
   # work under wayland, but its still useful for creating the config,
   # then modifying the system files.
   sudo sed -i.orig '/key *<KPMU> *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad
-fi
 
-##### basic graphical packages
-if has_monitor; then
+  ##### basic graphical packages
   pi konsole suckless-tools
 fi
 
 
+
 ##### install  emacs
 if $emacs; then
   if isarch; then
@@ -611,4 +598,5 @@ fi
 
 echo 0 >~/.local/distro-begin
 echo "$0: $(date): ending now"
+echo "exiting with status 0"
 exit 0