X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-begin;h=16d3359d5d8f8579250d9541e14f37479601089d;hp=b2b21f783f68c67b380e38f17704c2b91e6f2b41;hb=77917a8fbf2032a8b2634a1b3de0879ec45cf213;hpb=6459d4698ef983f7b1540589b87013c76913393d diff --git a/distro-begin b/distro-begin index b2b21f7..16d3359 100755 --- a/distro-begin +++ b/distro-begin @@ -1,4 +1,4 @@ -#!/bin/bash -l +#!/bin/bash # Copyright (C) 2016 Ian Kelling # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,12 +22,29 @@ # set the scrollback to unlimited in case something goes wrong +# send to registrar, glue records: +# for iankelling.org: + +# ns1.iankelling.org 72.14.176.105 +# ns1.iankelling.org 2600:3c00::f03c:91ff:fe6d:baf8 +# ns2.iankelling.org 172.105.84.95 +# ns2.iankelling.org 2a01:7e01::f03c:91ff:feb5:baec + +# for zroe.org: + +# ns1.zroe.org 72.14.176.105 +# ns1.zroe.org 2600:3c00::f03c:91ff:fe6d:baf8 +# ns2.zroe.org 172.105.84.95 +# ns2.zroe.org 2a01:7e01::f03c:91ff:feb5:baec +# + + + ####### begin setup environment ####### ### make ssh interactive shell run better. for when running line interactively line by line -sudo bash -c 'source /a/c/.bashrc && source /a/exe/ssh-emacs-setup' - +sudo bash -c '/a/exe/ssh-emacs-setup' ##### setup error handling interactive=true # set this to false to force set -x @@ -36,10 +53,14 @@ if ! $interactive; then set -x fi source /a/bin/errhandle/err + +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)" @@ -75,14 +96,14 @@ source $script_dir/pkgs set +x source /a/bin/distro-functions/src/identify-distros $interactive || set -x -for f in kd x2 x3 frodo tp li lj demohost kw; do +for f in kd x2 x3 frodo tp li l2 demohost kw; do eval "$f() { [[ $HOSTNAME == $f ]]; }" done codename=$(debian-codename) has_wayland() { has_monitor && [[ $codename == buster ]]; } has_x() { has_monitor && [[ $codename != buster ]]; } has_monitor() { ! linode ; } -linode() { lj || li; } +linode() { l2 || li; } # linode actually has btrfs now, but we dont do anything with it. has_btrfs() { ! linode; } home_network() { ! linode && ! kw; } @@ -105,7 +126,9 @@ 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. # 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 @@ -125,13 +148,11 @@ 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' [Unit] -Description=Turn off automatic decryption of drives on boot +Description=keyscriptoff [Service] Type=oneshot @@ -146,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 /dev/null; then - sudo dd if=$tmp of=/etc/initramfs-tools/modules - sudo /usr/sbin update-initramfs -u -k all + ## /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 /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: @@ -190,8 +222,15 @@ 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 +# 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 </dev/null || sudo groupadd -r bind +# linode needs bind group before conflink +if linode; then + pi-nostart bind9 fi # this needs to be before installing pacserve so we have gpg conf. conflink @@ -221,6 +260,7 @@ conflink set +x err-allow source /etc/profile.d/environment.sh +export BRC=t # shellcheck source=./.bashrc source ~/.bashrc err-catch @@ -300,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, @@ -310,7 +350,7 @@ case $distro in sudo rmmod evbug ||: # might not be loaded yet file=/etc/modprobe.d/evbug.conf line="blacklist evbug" - if ! grep -xFq "$line" $file; then + if [[ $(cat $file) != $line ]]; then sudo dd of=$file 2>/dev/null <<<"$line" sudo depmod -a sudo update-initramfs -u @@ -321,15 +361,15 @@ esac ###### link files # convenient to just do all file linking in one place -s /a/exe/lnf -T /a/bin /b -s /a/exe/lnf -T /nocow/t /t +sudo /a/exe/lnf -T /a/bin /b +sudo /a/exe/lnf -T /nocow/t /t if has_p; then lnf -T /p/News ~/News fi -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 +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/bin/ds/install-my-scripts # needed for rootsshsync cronjob -s /a/exe/lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root +sudo /a/exe/lnf /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root @@ -340,7 +380,7 @@ case $(distro-name) in arch) # pkgfile is like apt-cache pi pkgfile - s pkgfile --update + sudo pkgfile --update ;; esac @@ -358,8 +398,8 @@ fi ##### make extra dirs dirs=(/mnt/{1,2,3,4,5,6,7,8,9} /nocow/t) -s mkdir -p "${dirs[@]}" -s chown $USER:$USER "${dirs[@]}" +sudo mkdir -p "${dirs[@]}" +sudo chown $USER:$USER "${dirs[@]}" ###### setup /i if home_network; then @@ -368,8 +408,8 @@ if home_network; then /i/k /k none bind,noauto 0 0 EOF if ! mountpoint /kr; then - s mkdir -p /kr - s chown $USER:user2 /kr + sudo mkdir -p /kr + sudo chown $USER:user2 /kr fi if [[ $HOSTNAME == frodo ]]; then tu /etc/fstab <<'EOF' @@ -380,14 +420,14 @@ EOF frodo:/k /kr nfs noauto 0 0 EOF fi - s mkdir -p /q /i/{w,k} + sudo 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 + sudo mkdir -p $dir + sudo chown $USER:$USER $dir done # not needed for all hosts, but rather just keep it uniform - s mkdir -p /mnt/iroot + sudo 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... @@ -395,7 +435,7 @@ EOF # 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' + sudo dd of=/root/imount <<'EOF' #!/bin/bash [[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" set -eE -o pipefail @@ -411,8 +451,8 @@ for dir in /i /mnt/iroot /k /kr /w; do fi done EOF - s chmod +x /root/imount - s dd of=/etc/systemd/system/imount.service < *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad -fi + sudo sed -i.orig '/key * *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad -##### basic graphical packages -if has_monitor; then + ##### basic graphical packages pi konsole suckless-tools fi + ##### install emacs if $emacs; then if isarch; then @@ -582,5 +595,8 @@ if $emacs; then /a/exe/ssh-emacs-setup fi + +echo 0 >~/.local/distro-begin echo "$0: $(date): ending now" +echo "exiting with status 0" exit 0