X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-begin;h=abcb892f5e1f4747e64cd6a7adb474af8ba21555;hb=7e4f3d0a6130b69b7f76a3ff13e510ffbeb1484b;hp=633e8d1e3c326085460c9e97784f9756a5c85a0e;hpb=b1c29177fe76f8f2a557f7f36c987df3ef2a6cb4;p=distro-setup

diff --git a/distro-begin b/distro-begin
index 633e8d1..abcb892 100755
--- a/distro-begin
+++ b/distro-begin
@@ -14,7 +14,8 @@
 # limitations under the License.
 
 # for setting up a new machine
-# usage: $0 [-r] HOSTNAME
+# usage: $0 [-r] [HOSTNAME]
+# HOSTNAME changes the machine's hostname
 
 # tips:
 # run any sudo command first so your pass is cached
@@ -36,6 +37,12 @@ if ! $interactive; then
 fi
 source /a/bin/errhandle/err
 
+_errcatch_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)"
@@ -54,9 +61,11 @@ fi
 
 ### arg parsing
 recompile=false
+emacs=true
 while [[ $1 == -* ]]; do
   case $1 in
     -r) recompile=true; shift ;;
+    -e) emacs=false; shift ;;
   esac
 done
 if [[ $1 ]]; then
@@ -71,17 +80,19 @@ source $script_dir/pkgs
 set +x
 source /a/bin/distro-functions/src/identify-distros
 $interactive || set -x
-for f in iank-dev htpc kd x2 x3 frodo tp li lj demohost kw fz; do
+for f in kd x2 x3 frodo tp li lj demohost kw; do
   eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 codename=$(debian-codename)
-has_wayland() { [[ $codename == buster ]]; }
-has_x() { [[ $codename != buster ]]; }
+has_wayland() { has_monitor && [[ $codename == buster ]]; }
+has_x() { has_monitor && [[ $codename != buster ]]; }
 has_monitor() { ! linode ; }
 linode() { lj || li; }
+# linode actually has btrfs now, but we dont do anything with it.
 has_btrfs() { ! linode; }
-home_network() { ! linode; }
-encrypted() { has_p; }
+home_network() { ! linode && ! kw; }
+has_p() { ! linode; }
+encrypted() { true; }
 shopt -s extglob
 export GLOBIGNORE="*/.:*/.."
 umask 022
@@ -100,6 +111,8 @@ if encrypted; then
   sudo dd of=/etc/systemd/system/keyscripton.service <<'EOF'
 [Unit]
 Description=Turn on automatic decryption of drives on boot
+# This is triggered by reboot and when keyscriptoff stops.
+
 # tried using graphical.target, but it made my display manager restart before rebooting.
 # generally, I don't think targets order shutdown like they do startup.
 # So, I did systemd-analyze plot > something.svg, and picked a reliably started
@@ -119,8 +132,6 @@ ExecStop=/a/exe/keyscript-on
 WantedBy=keyscriptoff.service
 EOF
   sudo systemctl daemon-reload # needed if the file was already there
-  sudo systemctl stop keyscripton.service
-  #    sudo systemctl start keyscripton.service
   sudo systemctl enable keyscripton.service
 
   sudo dd of=/etc/systemd/system/keyscriptoff.service <<'EOF'
@@ -138,14 +149,24 @@ EOF
   sudo systemctl enable keyscriptoff.service
   sudo systemctl start keyscriptoff.service
 
+  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=/etc/initramfs-tools/modules
-  sudo apt-get -y install initramfs-tools-core
+    | 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
   # initram auth keys get setup with rootsshsync
+  $script_dir/rootsshsync
   # then for remote unlock, ssh and do this once per crypt disk:
   # echo -n PASS >/lib/cryptsetup/passfifo
+  # or for buster+
+  # cryptroot-unlock
+
 fi
 ##### end setup encryption scripts ######
 
@@ -155,19 +176,6 @@ fi
 
 # todo, it would be nice to cut down on some of the output
 
-##### fedora prereq/fundamental settings
-if isfedora; then
-  # comment out line disallowing calling sudo in scripts
-  sudo $sed -i 's/^Defaults *requiretty/#\0 # ian commented/' /etc/sudoers
-  # turn on magic sysrq commands
-  echo 1 > sudo dd of=/proc/sys/kernel/sysrq
-  echo "kernel.sysrq = 1" > /etc/sysctl.d/90-sysrq.conf
-  # selinux is not user friendly. Like, you enable samba, but you haven't run the magic selinux commands so it doesn't work
-  # and you have no idea why.
-  sudo $sed -i 's/^\(SELINUX=\).*/\1disabled/' /etc/selinux/config
-  selinuxenabled && sudo setenforce 0
-fi
-
 
 #### rerun my fai-time scripts
 # already ran for pxe installs, but used for vps & updates
@@ -183,6 +191,10 @@ case $distro in
 esac
 
 ###### setup hostname
+if [[ $HOSTNAME != $(cat /etc/hostname) ]]; then
+  echo $HOSTNAME > /etc/hostname
+  hostname -F /etc/hostname
+fi
 sudo $sed -i '/^127\.0\.1\.1/d' /etc/hosts
 echo "127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME" | sudo tee -a /etc/hosts
 
@@ -195,7 +207,7 @@ fi
 
 
 #### setup bash for root
-for x in /a/c/{.bashrc,brc,.bash_profile,.profile,.inputrc,path_add_function}; do
+for x in /a/c/{.bashrc,brc,brc2,.bash_profile,.profile,.inputrc,path_add_function}; do
   sudo -i <<EOF
 PATH="/a/exe:$PATH"
 lnf $x /root
@@ -221,16 +233,20 @@ $interactive || set -x
 
 
 #### setup passwordless sudo
-tu /etc/sudoers <<EOF
-$USER  ALL=(ALL)  NOPASSWD: ALL
-Defaults  env_keep += SUDOD
+
+# always_set_home
 # makes ubuntu be like debian
 # https://unix.stackexchange.com/a/91572
-Defaults always_set_home
-# default setting is to have  minimum umask of 0022
+
+# umask: default setting is to have  minimum umask of 0022
 # This lets us have user-specific umasks which are more permissive.
 # I did this for transmission and set it's umask gecos on install,
 # see there for more info.
+
+tu /etc/sudoers <<EOF
+$USER  ALL=(ALL)  NOPASSWD: ALL
+Defaults  env_keep += SUDOD
+Defaults always_set_home
 Defaults !umask
 EOF
 
@@ -285,14 +301,6 @@ pup
 
 
 ###### p1 packages install ######
-if isarch; then
-  # requirement for trash-cli.
-  # background: strange error if just installing trash-cli: "pyalpm requires python",
-  # so I see that it requires python2, and installing that manually fixes it.
-  # I didn\'t see this on earlier installation, main thing which changed was
-  # pacserve, so not sure if it\'s related.
-  pi python2
-fi
 pi ${p1[@]}
 
 
@@ -318,62 +326,18 @@ esac
 
 ###### link files
 # convenient to just do all file linking in one place
-s lnf -T /a/bin /b
-s lnf -T /nocow/t /t
+s /a/exe/lnf -T /a/bin /b
+s /a/exe/lnf -T /nocow/t /t
 if has_p; then
   lnf -T /p/News ~/News
 fi
-s lnf /q/root/.editor-backups /q/root/.undo-tree-history \
+s /a/exe/lnf /q/root/.editor-backups /q/root/.undo-tree-history \
   /a/opt /a/c/.emacs.d $HOME/mw_vars /k/backup /root
-pi rsync # needed for rootsshsync
-/a/bin/ds/install-my-scripts # needed for rootsshsync
-rootsshsync
-s lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root
-if has_p; then
-  # for dovecot
-  lnf -T /i/k/mboxes ~/mail
-fi
+/a/bin/ds/install-my-scripts # needed for rootsshsync cronjob
+s /a/exe/lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root
 
 
 
-##### install xinput
-if has_x; then
-  case $(distro-name) in
-    trisquel|ubuntu|debian)
-      pi xinput
-      ;;
-    fedora)
-      pi xinput_calibrator
-      ;;
-    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
-      ;;&
-    fedora)
-      pi redshift-gtk
-      ;;&
-    arch)
-      pi redshift
-      ;;&
-  esac
-fi
-
-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.
-  s sed -i.orig '/key *<KPMU> *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad
-fi
-
 
 
 #### arch specific early packages
@@ -385,22 +349,12 @@ case $(distro-name) in
     ;;
 esac
 
-#### fedora specific packages
-case $(distro-name) in
-  fedora)
-    # todo, this could probably come later
-    p -y groupinstall development-tools c-development books admin-tools
-    pi man-pages
-    ;;
-  # other distros unknown
-esac
-
 #### enable trim
 # enable trim for volume delete, other rare commands
 sudo $sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf
 if encrypted; then
   # flidas or so, these units arent built-in
-  if isdeb && ! systemctl list-unit-files | grep -xF fstrim.timer &>/dev/null ; then
+  if isdeb && ! systemctl list-unit-files | grep ^fstrim.timer &>/dev/null ; then
     sudo cp /usr/share/doc/util-linux/examples/fstrim.{service,timer} /etc/systemd/system
   fi
   # does weekly trim
@@ -413,15 +367,15 @@ s mkdir -p "${dirs[@]}"
 s chown $USER:$USER  "${dirs[@]}"
 
 ###### setup /i
-tu /etc/fstab <<'EOF'
+if home_network; then
+  tu /etc/fstab <<'EOF'
 /i/w  /w  none  bind,noauto  0 0
 /i/k  /k  none  bind,noauto  0 0
 EOF
-if ! mountpoint /kr; then
-  s mkdir -p /kr
-  s chown $USER:user2 /kr
-fi
-if home_network; then
+  if ! mountpoint /kr; then
+    s mkdir -p /kr
+    s chown $USER:user2 /kr
+  fi
   if [[ $HOSTNAME == frodo ]]; then
     tu /etc/fstab <<'EOF'
 /k  /kr  none  bind,noauto  0 0
@@ -431,22 +385,20 @@ EOF
 frodo:/k  /kr  nfs  noauto  0 0
 EOF
   fi
-fi
-s mkdir -p /q /i/{w,k}
-for dir in /{i,w,k}; do
-  if mountpoint $dir; then continue; fi # already mounted
-  s mkdir -p $dir
-  s chown $USER:$USER $dir
-done
-# not needed for all hosts, but rather just keep it uniform
-s mkdir -p /mnt/iroot
-# debian auto mounting of multi-disk encrypted btrfs is busted.  It is
-# in jessie, and in stretch as of 11/26/2016 I have 4 disks in cryptab,
-# based on 3 of those, it creates .device units for /dev/mapper/dev...
-# then waits endlessly for them on bootup, after the /dev/mapper disks
-# have already been created and exist. todo: create a simple repro
-# for this in a vm and report it upstream.
-if has_btrfs || home_network; then
+  s mkdir -p /q /i/{w,k}
+  for dir in /{i,w,k}; do
+    if mountpoint $dir; then continue; fi # already mounted
+    s mkdir -p $dir
+    s chown $USER:$USER $dir
+  done
+  # not needed for all hosts, but rather just keep it uniform
+  s mkdir -p /mnt/iroot
+  # debian auto mounting of multi-disk encrypted btrfs is busted.  It is
+  # in jessie, and in stretch as of 11/26/2016 I have 4 disks in cryptab,
+  # based on 3 of those, it creates .device units for /dev/mapper/dev...
+  # then waits endlessly for them on bootup, after the /dev/mapper disks
+  # have already been created and exist. todo: create a simple repro
+  # for this in a vm and report it upstream.
   pi nfs-common
   s dd of=/root/imount <<'EOF'
 #!/bin/bash
@@ -465,7 +417,6 @@ for dir in /i /mnt/iroot /k /kr /w; do
 done
 EOF
   s chmod +x /root/imount
-
   s dd of=/etc/systemd/system/imount.service <<EOF
 [Unit]
 Description=Mount /i and related mountpoints
@@ -487,6 +438,7 @@ EOF
   sudo systemctl enable imount.service
   sudo systemctl start imount.service
 fi
+###### end setup /i
 
 ##### setup /nocow.
 # a nocow dir that is common to multiple distros installed on the same system
@@ -523,23 +475,6 @@ if isubuntu; then
 fi
 
 
-##### install  emacs
-if isarch; then
-  # emacs git build was broken last time i checked,
-  x=$(mktemp -d)
-  pushd $x
-  aurex emacs-git
-  makepkg -si --noconfirm
-  popd
-  rm -rf $x
-  pi hunspell hunspell-en
-else
-  if $recompile; then
-    /a/bin/buildscripts/emacs
-  else
-    /a/bin/buildscripts/emacs --no-r || /a/bin/buildscripts/emacs
-  fi
-fi
 
 ##### install laptop hardware packages
 if tp || x2 || x3; then
@@ -556,23 +491,38 @@ if tp || x2 || x3; then
   esac
 fi
 
-
-##### install x stuff
-if has_monitor; then
-  pi ${p2[@]}
-  if has_x; then
-    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
+if has_x; then
+  ###### 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
-fi
 
+  ##### install xinput
+  case $(distro-name) in
+    trisquel|ubuntu|debian)
+      pi xinput
+      ;;
+    arch)
+      pi xorg-xinput
+      ;;
+  esac
 
-##### setup X autostart
-if has_x; then
+  #### 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
+
+  ##### setup X autostart
   if isarch; then
     # https://wiki.archlinux.org/index.php/Xinitrc
     for homedir in /home/*; do
@@ -588,12 +538,7 @@ EOF
   else
     # todo, figure this out for arch if we ever try out gnome.
     # install for multiple display managers in case we use one
-    if isdeb; then
-      dir=/etc/gdm3
-    elif isfedora; then
-      # fedora didn\'t have the 3.
-      dir=/etc/gdm
-    fi
+    dir=/etc/gdm3
     s mkdir -p $dir/PostLogin
     s command cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
     s mkdir /etc/lightdm/lightdm.conf.d
@@ -602,13 +547,47 @@ EOF
 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.
+  s sed -i.orig '/key *<KPMU> *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad
 fi
 
+##### basic graphical packages
+if has_monitor; then
+  pi konsole suckless-tools
+fi
 
-#### refix interactive ssh terminal
-# the first pup command can kill off our /etc/ mod, so rerun this
-/a/exe/ssh-emacs-setup
+
+##### install  emacs
+if $emacs; then
+  if isarch; then
+    # emacs git build was broken last time i checked,
+    x=$(mktemp -d)
+    pushd $x
+    aurex emacs-git
+    makepkg -si --noconfirm
+    popd
+    rm -rf $x
+    pi hunspell hunspell-en
+  else
+    if $recompile; then
+      /a/bin/buildscripts/emacs
+    else
+      /a/bin/buildscripts/emacs --no-r
+    fi
+  fi
+  # the first pup command can kill off our /etc/ mod, so rerun this
+  /a/exe/ssh-emacs-setup
+fi
 
 
+echo 0 >~/.local/distro-begin
 echo "$0: $(date): ending now"
 exit 0