X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-begin;h=b2b21f783f68c67b380e38f17704c2b91e6f2b41;hp=633e8d1e3c326085460c9e97784f9756a5c85a0e;hb=6459d4698ef983f7b1540589b87013c76913393d;hpb=b1c29177fe76f8f2a557f7f36c987df3ef2a6cb4 diff --git a/distro-begin b/distro-begin index 633e8d1..b2b21f7 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 @@ -35,6 +36,7 @@ if ! $interactive; then set -x fi source /a/bin/errhandle/err +source /a/bin/distro-functions/src/package-manager-abstractions ### setup logging exec &> >(sudo tee -a /var/log/distro-begin) @@ -54,9 +56,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 +75,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 @@ -138,14 +144,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 /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 +171,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 +186,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 @@ -221,16 +228,20 @@ $interactive || set -x #### setup passwordless sudo -tu /etc/sudoers < *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad -fi - #### arch specific early packages @@ -385,22 +344,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 +362,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 +380,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 +412,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 < *{/,/}/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: $(date): ending now" exit 0