#!/bin/bash -l
# Copyright (C) 2016 Ian Kelling
-# This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
-
-
-# for bootstrapping a new machine
-
-# to make ssh run better, first run this:
-sudo bash -c 'source /a/c/repos/bash/.bashrc && source /a/bin/ssh-emacs-setup'
-
-
-# see t.org for OS installer notes
-
-# usage: $0 [OPTIONS] HOSTNAME
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# for setting up a new machine
+# usage: $0 [-r] HOSTNAME
# tips:
# run any sudo command first so your pass is cached
# set the scrollback to unlimited in case something goes wrong
-if [[ $EUID == 0 ]]; then
- echo "error: do not run as root"
- exit
-fi
-interactive=true # set this to true if running by hand in emacs
-[[ $- == *i* ]] || interactive=false
+####### 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'
+
+##### setup error handling
+interactive=true # set this to false to force set -x
+[[ $- == *i* ]] || interactive=false
if ! $interactive; then
set -x
- set -e -o pipefail
fi
-set -E
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+source /a/bin/errhandle/err
-# headless=false # unused atm
-recompile=true
-# for copying to a new data fs
-bootstrapfs=false # old flag, needs new look before using.
+### setup logging
+exec &> >(sudo tee -a /var/log/distro-begin)
+echo "$0: $(date): starting now)"
+
+
+### sanity checking
+if [[ $EUID == 0 ]]; then
+ if getent passwd iank || getent passwd ian ; then
+ echo "$0: error: running as root. unprivileged user exists. use it."
+ exit 1
+ else
+ echo "$0: warning: running as root. I will setup users then exit"
+ fi
+fi
+
+
+### arg parsing
+recompile=false
while [[ $1 == -* ]]; do
case $1 in
- # avoid some of the longer compilation steps,
- # when we need to rerun because we had an error
- -n) recompile=false; shift ;;
+ -r) recompile=true; shift ;;
esac
done
-
if [[ $1 ]]; then
- host=$1
-else
- host=$HOSTNAME
+ export HOSTNAME=$1
fi
-for f in iank-dev htpc treetowl x2 frodo tp; do
- eval "$f() { [[ $host == $f ]]; }"
-done
-has_p() { iank-dev || x2 || frodo; }
-encrypted() { has_p || tp; }
+##### variables/env setup
+script_dir="$(readlink -f "$BASH_SOURCE")"; script_dir=${script_dir%/*}
+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
+ eval "$f() { [[ $HOSTNAME == $f ]]; }"
+done
+has_p() { ! linode; } # when tp is tracis, then not tp either
+has_x() { ! linode; }
+linode() { lj || li; }
+has_btrfs() { ! linode; }
+home_network() { ! linode; }
+encrypted() { has_p; }
shopt -s extglob
export GLOBIGNORE=*/.:*/..
-umask 0002
-
-
-####### end command line parsing
+umask 022
+PATH="/a/exe:$PATH"
+sed="sed --follow-symlinks"
+####### end setup environment #######
-if frodo; then
- x=/usr/local/bin/iancryptsetup
- sudo dd of=$x <<'EOF'
-#!/bin/bash -x
-# man systemd-cryptsetup-generator
-#man systemd-cryptsetup
-#man systemd-cryptsetup@.service
-f=/tmp/iancryptsetup
-ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null \
- -T -i /p/cryptkeyssh/id_rsa ian@treetowl > $f || exit 0
-# example of initial setup of a disk
-#disk=/dev/sdg2
-#echo YES|cryptsetup --verbose luksFormat $disk $f
-## copy $f into paste buffer, then enter memorized pass, which we can use
-## This is for the case of ssh not being available
-#cryptsetup --verbose --verify-passphrase luksAddKey $disk
-
-# initial keyfile can be generated like any random pass
-# head -c 200 /dev/urandom | tr -cd '[:alnum:]' | head -c 80 > keyfile
+##### begin setup encryption scripts ######
+if encrypted; then
+ # I tried making a service which was dependent on reboot.target,
+ # 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
+# 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
+# service that happens late in the game.
+After=ntp.service
+DefaultDependencies=no
+# not sure if needed, makes sure we shut down before reboot.target
+Conflicts=reboot.target
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/true
+ExecStop=/a/exe/keyscript-on
-data=(
-b1d7f102-c7cd-40a0-bff0-2d498692b5a7 crypta7
-80649f08-1977-441b-ad8f-246931571702 crypt02
-3ae71d1a-dbd5-4cbe-afa2-c7529c0c4d31 crypt31
-bd4bbf8e-35c1-48e5-bb15-106c1b47792b crypt2b
-c061a929-54fe-4a47-939d-c008ba418246 crypt46
-ec709a4b-1ba7-463f-a1cd-841cb40868f0 cryptf0
-b9f2a980-f57c-4c58-9313-055da09d579c crypt9c
-747b9932-aa98-4552-86ab-657d0ccd4fb0 cryptb0
-afb44dd6-28ba-443b-9ca4-34dc2a95a213 crypt13
-)
-for ((i=0; i<${#data[@]}; i+=2)); do
- cryptsetup luksOpen --key-file $f UUID=${data[i]} ${data[i+1]}
-done
-for x in a q /mnt/btrfs_root; do
- mount /$x
-done
-#/a/bin/firefox-link
-exit 0
+[Install]
+WantedBy=keyscriptoff.service
EOF
- sudo chmod +x $x
- # todo, it needs to wait for networking
- sudo dd of=/etc/systemd/system/iancrypt.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=iancrypt
+Description=Turn off automatic decryption of drives on boot
[Service]
Type=oneshot
-ExecStart=/usr/local/bin/iancryptsetup
+ExecStart=/a/exe/keyscript-off
[Install]
WantedBy=multi-user.target
EOF
- sudo systemctl enable iancrypt.service
- sudo systemctl restart iancrypt.service
+ sudo systemctl daemon-reload # needed if the file was already there
+ sudo systemctl enable keyscriptoff.service
+ sudo systemctl start keyscriptoff.service
fi
+##### end setup encryption scripts ######
+# disabled until its fixed up
+# install-myqueue
-if iank-dev; then
- desktop=$(ssh root@iankelling.org grep desktop /etc/hosts | grep -o "^.* ")
- if $bootstrapfs; then
- # for bootstrapping at a new job:
- cp="scp $desktop:"
- # for moving to a new hd, change $cp to move between filesystems
- mkdir -p /a/bin
- chown -R ian:ian /a
- $cp/a/c /a
- $cp/a/c/bin/{bash-programs-by-ian,distro-begin,distro-functions,input-setup.sh} /a/bin
- echo -e \\n\\n\\n | ssh-keygen -t rsa
- fi
-fi
-
-# example which will be usefull when redoing desktop
-# if x2; then
-# f=/etc/fstab
-# line='/dev/mapper/fedora-a /a btrfs noatime 0 1'
-# if ! grep -Fxq "$line" $f; then
-# echo "$line" | sudo tee -a $f >/dev/null
-# fi
-# if ! mount | grep -q '^/dev/mapper/fedora-a'; then
-# dir=/a
-# sudo mkdir -p $dir
-# sudo chown ian:ian $dir
-# sudo mount $dir
-# fi
-# fi
-
-# set noatime.
-sudo sed -ri '/noatime/!s/(ext[234]|btrfs)[[:space:]]+/\1 noatime,/' /etc/fstab
-sudo sed -ri '/noatime/s/relatime,?|defaults,?//g' /etc/fstab
-
-
-# this script has been designed to be idempotent
# todo, it would be nice to cut down on some of the output
-
-
-# output is below so shellcheck can verify sources
-for x in /a/bin/bash-programs-by-ian/repos/{errhandle,tee-unique,lnf}/*-function; do
- echo "# shellcheck source=$x";
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/errhandle/bash-trace-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/errhandle/errallow-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/errhandle/errcatch-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/errhandle/errexit-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/tee-unique/teeu-function
- # shellcheck source=/a/bin/bash-programs-by-ian/repos/lnf/lnf-function
- source $x
-done
-
-
-set +e
-$interactive || errcatch
-source /a/bin/distro-functions/src/identify-distros
-echo path:$PATH
-
-
-
+##### 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 for this boot cycle
+ 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
+ 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
+distro=$(distro-name)
+case $distro in
+ ubuntu|debian|trisquel)
+ sudo bash -c ". /a/bin/fai/fai-wrapper && /a/bin/fai/fai/config/scripts/GRUB_PC/11-iank"
+ ;;
+ *)
+ sudo bash -c ". /a/bin/fai/fai-wrapper &&
+/a/bin/fai/fai/config/distro-install-common/end"
+ ;;
+esac
+###### setup hostname
+sudo $sed -i '/^127\.0\.1\.1/d' /etc/hosts
+echo "127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME" | sudo tee -a /etc/hosts
-# link files
+##### exit first stage if running as root
+if [[ $EUID == 0 ]]; then
+ echo "$0: running as root. exiting now that users are setup"
+ exit 0
+fi
-lnf /a/c/* /a/bin ~
-for x in /a/c/repos/bash/!(.git); do
- lnf "$x" ~
+#### setup bash for root
+for x in /a/c/{.bashrc,brc,.bash_profile,.profile,.inputrc,path_add_function}; do
sudo -i <<EOF
-source /a/bin/bash-programs-by-ian/repos/lnf/lnf-function
+PATH="/a/exe:$PATH"
lnf $x /root
EOF
done
-echo path:$PATH
+###### do conflink
+# li needs the bind group before conflink
+if [[ $HOSTNAME == li ]]; then
+ getent group bind &>/dev/null || sudo groupadd -r bind
+fi
+# this needs to be before installing pacserve so we have gpg conf.
+conflink
+###### bash environment setup
set +x
-errallow
+err-allow
+source /etc/profile.d/environment.sh
source ~/.bashrc
-echo path:$PATH
-$interactive || errcatch
+err-catch
$interactive || set -x
-# passwordless sudo
-tu /etc/sudoers <<'EOF'
-ian ALL=(ALL) NOPASSWD: ALL
+#### setup passwordless sudo
+tu /etc/sudoers <<EOF
+$USER ALL=(ALL) NOPASSWD: ALL
Defaults env_keep += SUDOD
+# makes ubuntu be like debian
+# https://unix.stackexchange.com/a/91572
+Defaults always_set_home
+# 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.
+Defaults !umask
EOF
-# enable magic sysrq keys. debian docs say it is already enabled by default
-isfedora && tu /etc/sysctl.conf 'kernel.sysrq = 1'
-
-
-
-if isdebian; then
- # add contrib non-free to sources for main
- s sed -i 's/^\(deb.* main\).*/\1 contrib non-free/' /etc/apt/sources.list
-
- # non-existent var, as Im not planning to use stable right now
- if isdebian-stable; then
- code=$(debian-codename)
- s dd of=/etc/apt/sources.list.d/mozilla-iceweasel <<EOF
-deb http://mozilla.debian.net/ $code-backports iceweasel-release
-deb-src http://mozilla.debian.net/ $code-backports iceweasel-release
-EOF
-
- # we change the mirror from the default, so we cant use tu
- s dd of=/etc/apt/sources.list.d/main-backports <<EOF
-deb http://ftp.us.debian.org/debian/ $code-backports main contrib non-free
-deb-src http://ftp.us.debian.org/debian/ $code-backports main contrib non-free
-EOF
+#### setup firefox backport
+## ian: disabled. backports are not being published atm due to rust packaging issue
+# if isdeb; then
+# codename=$(debian-codename)
+# if isdebian-stable && has_x; then
+# s dd of=/etc/apt/sources.list.d/mozilla-iceweasel.list <<EOF
+# deb http://mozilla.debian.net/ $codename-backports firefox-release
+# deb-src http://mozilla.debian.net/ $codename-backports firefox-release
+# EOF
+# p update
+# # take care of mozilla signing errors in previous command
+# pi pkg-mozilla-archive-keyring
+# fi
+# p update
+# fi
- p update
- # take care of mozilla signing errors in previous command
- pi pkg-mozilla-archive-keyring
- else
- :
- # this would change stable to testing, but I set that up already.
- # It\'s just a no-op if its already testing.
- # sudo sed -ri 's!^( *[^ #]+ +[^ ]+ +)[[:alpha:]]+(.*)!\1testing\2!' /etc/apt/sources.list
- p update
- fi
-fi
+###### arch aur wrapper setup
if isarch; then
#https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages
sudo pacman -S --noconfirm --needed base-devel jq
}
aurpi cower pacaur
- # this creates ~/.gnupg. addgnupghome is broken on arch.
- gpg -k
- # for aur, automatically dl & add gpg keys.
- # Just the keyserver-options line goes in dirmngr.conf once
- # this bug is fixed: https://bugs.gnupg.org/gnupg/issue2147
- teeu ~/.gnupg/gpg.conf <<EOF
-$(grep -o '^ *keyserver .*' ~/.gnupg/dirmngr.conf)
-keyserver-options auto-key-retrieve
-EOF
pi pacserve
- x=$(mktemp); pacman.conf-insert_pacserve >$x
+
+ x=$(mktemp); /usr/bin/pacman.conf-insert_pacserve >$x
sudo dd of=/etc/pacman.conf if=$x; rm $x
sudo systemctl enable pacserve.service
sudo systemctl start pacserve.service
- # 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
+#### update all packages
pup
-pi trash-cli
-
-###### link files ###########
-# convenient to just do all file linking in one place
-lnf /a/* ~
-s lnf /a/sdx{,d} /
-
-# if it wasn't set already, we could set hostname here
-#echo treetowl | s dd of=/etc/hostname
-#s hostname -F /etc/hostname
-#HOSTNAME=$(hostname)
+###### 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[@]}
+
+
+######## fix evbug bug ######
+case $distro in
+ trisquel|ubuntu)
+ # noticed in flidas.
+ #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,
+ #but that file won't work and will get automatically reverted
+ sudo rmmod evbug ||: # might not be loaded yet
+ file=/etc/modprobe.d/evbug.conf
+ line="blacklist evbug"
+ if ! grep -xFq "$line" $file; then
+ sudo dd of=$file 2>/dev/null <<<"$line"
+ sudo depmod -a
+ sudo update-initramfs -u
+ fi
+ ;;
+esac
-#########################################
-# NOTE: only /a needs to be mounted for creating links!
-###########################################
-# todo: this is desktop specific. on work comp, mkdir /p/.editor-backups
-# todo: reconcile ~/.ssh/config work/home
+###### link files
+# convenient to just do all file linking in one place
+s lnf -T /a/bin /b
+s lnf -T /nocow/t /t
if has_p; then
- lnf -T /p/offlineimap ~/Maildir
lnf -T /p/News ~/News
- s lnf -T /q/p /p
- # don't use /* because I don't want to require it to be mounted
- s lnf /q/root/.editor-backups /q/root/.undo-tree-history \
- /q/root/.ssh /a/opt \
- /a/c/.emacs.d ~/.unison /root
-
+fi
+s 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
+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
-s lnf /a/c/.inputrc /a/c/.vim /a/c/.vimrc /a/c/.gvimrc /root
-if [[ $HOSTNAME == htpc ]]; then
- lnf -T /i/Videos ~/Downloads
-fi
-if has_p; then
- # for dovecot
- lnf -T /i/mboxes ~/mail
+
+##### 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
-# basic needed packages
+#### arch specific early packages
case $(distro-name) in
- debian)
- pi $( isdebian-stable && e -t $code-backports ) iceweasel
- # for hosts which require nonfree drivers
- case $HOSTNAME in
- tp|x2) : ;;
- *) pi linux-image-amd64 firmware-linux-nonfree \
- firmware-linux-free linux-headers-amd64
- ;;
- esac
- ;;&
- ubuntu|debian)
- pi xmacro gtk-redshift xinput
- ;;&
- fedora)
- p -y groupinstall development-tools c-development books admin-tools
- pi redshift-gtk
- # debian has this package patched to work, upstream is dead
- # tried using alien, pi alien, alien -r *.deb, rpm -Uhv *.rpm, got this error, so fuck it
- # file /usr/bin from install of xmacro-0.3pre_20000911-7.x86_64 conflicts with file from package filesystem-3.2-19.fc20.x86_64
- # http://packages.debian.org/source/sid/xmacro
- pi patch libXtst-devel wget man-pages # what is the ubuntu equivalent to man-pages?
- cd $(mktemp -d)
- wget http://ftp.de.debian.org/debian/pool/main/x/xmacro/xmacro_0.3pre-20000911.orig.tar.gz
- wget http://ftp.de.debian.org/debian/pool/main/x/xmacro/xmacro_0.3pre-20000911-6.diff.gz
- ex *.gz
- patch -p0 < xmacro_0.3pre-20000911-6.diff
- cd xmacro-0.3pre-20000911.orig
- make
- sleep 1 # not sure why the following command couldn\'t find, so trying this
- # no make install target
- s cp -f xmacroplay xmacrorec xmacrorec2 /usr/local/bin
- ;;&
arch)
- # libxtst is missing dep https://aur.archlinux.org/packages/xmacro/#news
- pi xorg-server redshift xorg-xinput pkgfile libxtst xmacro
- # like apt-cache
+ # pkgfile is like apt-cache
+ pi pkgfile
s pkgfile --update
- ;;&
+ ;;
esac
-pi xbindkeys xkbset cryptsetup unison
-
-pi lvm2
-# enables trim for volume delete, other rare commands.
-sudo sed -ri 's/( *issue_discards\b).*/\1 = 1/' /etc/lvm/lvm.conf
+#### 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
if isdeb; then
sudo cp /usr/share/doc/util-linux/examples/fstrim.{service,timer} /etc/systemd/system
sudo systemctl enable fstrim.timer
fi
-if has_p; then
- # relatime is default, but it still significantly increases writes
- # in comparison because it writes on the first read after each
- # write.
- #
- dirs=(/i /mnt/{1,2,3,4,5,6,7,8,9})
- if ! frodo; then
- dirs+=(/q)
- fi
- s mkdir -p "${dirs[@]}"
- s chown ian:ian "${dirs[@]}"
- # ssh and probably some other things care about parent directory
- # ownership, and ssh doesn\'t allow any group writable parent
- # directories, so we are forced to use a directory structure similar
- # to home directories
- s chown root:ian /q
- s chmod 755 /q
-
- if treetowl; then
- # get uuids from blkid and lvdisplay
- # at times Ive done this through the installer. not anymore
- tu /etc/fstab<<'EOF'
-/dev/mapper/cswap1 none swap sw 0 0
-/dev/mapper/q /q ext4 noatime 0 2
-UUID=3f7b31cd-f299-40b4-a86b-7604282e2715 /i btrfs noatime 0 2
-UUID=3f7b31cd-f299-40b4-a86b-7604282e2715 /mnt/btrfs_root btrfs noatime,subvolid=0 0 2
+##### 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[@]}"
+
+###### setup /i
+tu /etc/fstab <<'EOF'
+/i/w /w none bind,noauto 0 0
+/i/k /k none bind,noauto 0 0
EOF
- s mkdir -p /mnt/btrfs_root
- s dd of=/etc/crypttab <<'EOF'
-# i used to use UUID=<uuid> from cryptsetup luksUUID /dev/mapper/ianvg1-q
-# however, it doesn't work for lvm volumes when opening on the command line,
-# So, just using the thing which works both ways.
-q /dev/mapper/vg_treetowl00-lv01 none luks,discard,noauto
-# based on cryptsetup's README.Debian, and FAQ
-cswap1 /dev/mapper/vg_treetowl00-lv00 /dev/urandom swap,cipher=aes-cbc-essiv:sha256,size=256,hash=sha256,discard,noearly
+if ! mountpoint /kr; then
+ s mkdir -p /kr
+ s chown $USER:traci /kr
+fi
+if home_network; then
+ if [[ $HOSTNAME == frodo ]]; then
+ tu /etc/fstab <<'EOF'
+/k /kr none bind,noauto 0 0
+EOF
+ else
+ tu /etc/fstab <<'EOF'
+frodo:/k /kr nfs noauto 0 0
EOF
- s chmod 600 /etc/crypttab
-
- s systemctl daemon-reload
- s systemctl restart systemd-cryptsetup@q.service
- s mount /q
-
- s systemctl restart systemd-cryptsetup@cswap1.service
- # old ways:
- # s update-rc.d cryptdisks enable
-
- # misc notes about when messing around with jessie:
- # # this was useful on debian jessie:
- # systemd-tty-ask-password-agent --query
- # according to the broadcast message
- # jessie also still had /etc/init.d/cryptdisks,
- # which seemed to work only with reload, and it seems deprecated
- # and cryptdisks_start q, also prolly deprecated
-
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
+ pi nfs-common
+ s dd of=/root/imount <<'EOF'
+#!/bin/bash
+[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
+set -eE -o pipefail
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+for dir in /i /mnt/iroot /k /kr /w; do
+ if ! mountpoint $dir &>/dev/null && \
+ awk '{print $2}' /etc/fstab | grep -xF $dir &>/dev/null; then
+ if awk '{print $3}' /etc/fstab | grep -xF nfs &>/dev/null; then
+ mount $dir || echo "warning: failed to mount nfs on $dir"
+ else
+ mount $dir
+ fi
+ fi
+done
+EOF
+ s chmod +x /root/imount
+ s dd of=/etc/systemd/system/imount.service <<EOF
+[Unit]
+Description=Mount /i and related mountpoints
+Before=syncthing@$USER.service
+[Service]
+Type=oneshot
+ExecStart=/root/imount
-# exptected directory for .editor-backups
-if ! has_p; then
- s lnf /a/p /
-fi
-
-/a/bin/conflink
-
-
-# work desktop doesnt need gpg stuff, but it doesnt hurt
-s dd of=/etc/profile.d/environment.sh <<'EOF'
-# IAN: EDIT THIS FROM /a/bin/distro-begin
-
-if [ -f $HOME/path_add-function ]; then
- . $HOME/path_add-function
- path_add /usr/sbin /usr/local/sbin /sbin
- path_add /a/bin /a/opt/bin $HOME/.cabal/bin
-
- if [ -r /etc/alternatives/java_sdk ]; then
- export JAVA_HOME=/etc/alternatives/java_sdk
- path_add /etc/alternatives/java_sdk
- fi
+[Install]
+RequiredBy=syncthing@$USER.service
+# note /kr needs networking, this target is the simplest way to
+# time it when the network should be up, but not do something
+# dumb like delay startup until the network is up. It happens
+# at some time after network.target
+WantedBy=multi-user.target
+EOF
+ sudo systemctl daemon-reload # needed if the file was already there
+ sudo systemctl enable imount.service
+ sudo systemctl start imount.service
fi
-export EDITOR="emacsclient"
-# this makes emacsclient file/-c start a server instance if none is running,
-# instead of some alternate editor logic
-export ALTERNATE_EDITOR=""
-
-# ubuntu starts gpg agent automatically with /etc/X11/Xsession.d/90gpg-agent.
-# fedora doesn't, which left me to figure this out, and google was no help.
-# fedora documentation is often quite bad :(
-# This is mostly copied from that file.
-# Main difference is that we eval the result of starting gpg-agent,
-# while that file executes it through xsession specific var.
-# Also make sourcing the pidfile make more sense.
-# End result should be the same afaik.
-# for gpg-agent to work when calling gpg from the command line,
-# we need an environment variable that is setup via the eval.
-# which is why we do this upon login, so it can propogate
-# It is also written to the file $HOME/.gnupg/gpg-agent-info-$(hostname)
-# I'm not aware if that is ever used, but just fyi.
-# I also added the bit about xmessaging the stderr,
-# because I'd like to know if the command fails
-if [ -f /etc/fedora-release ]; then
- : ${GNUPGHOME=$HOME/.gnupg}
-
- GPGAGENT=/usr/bin/gpg-agent
- PID_FILE="$GNUPGHOME/gpg-agent-info-$(hostname)"
-
- if ! $GPGAGENT 2>/dev/null; then
- temp="$(mktemp)"
- eval "$($GPGAGENT --homedir /p/do-not-delete --daemon --sh --write-env-file=$PID_FILE 2>$temp)"
- temperr="$(<"$temp")"
- [ -n "$temperr" ] && xmessage "gpg-agent stderr: $temperr"
- elif [ -r "$PID_FILE" ]; then
- . "$PID_FILE"
- export GPG_AGENT_INFO
+##### setup /nocow.
+# a nocow dir that is common to multiple distros installed on the same system
+dir=/nocow
+if has_btrfs; then
+ if ! mountpoint $dir; then
+ subvol=/mnt/root/nocow
+ if [[ ! -e $subvol ]]; then
+ s btrfs subvolume create $subvol
+ s chown root:1000 $subvol
+ s chattr +C $subvol
+ fi
+
+ first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
+ tu /etc/fstab <<EOF
+$first_root_crypt /nocow btrfs noatime,subvol=nocow 0 0
+EOF
+ s mkdir -p $dir
+ s chown $USER:$USER $dir
+ s mount $dir
fi
+else
+ sudo mkdir -p $dir
fi
-# ubuntu has 002, debian has 022.
-# from what I've read, benefit of 002 makes shared groups read/write.
-# Security concern is where some unixes put everyone in a same group,
-# so if you copy files there with exact perms, that is probably not
-# what you want. I don't use a system like that, and I don't really care
-# either way, but I'd prefer
-# being able to sync file perms with ubuntu systems at work,
-# and it's easier to change the debian one.
-
-umask 002
-EOF
+###### fix mouse on jessie
+# it comes with stretch and arch, but not jessie.
+# propogate /etc/udev/hwdb.d
+if which systemd-hwdb; then
+ s systemd-hwdb update
+ ser restart systemd-udev-trigger
+fi
-# emacs dependency.
-# dunno why debian installed postfix with yum-builddep emacs
-# but I will just explicitly install it here since
-# I use it for sending mail in emacs.
-if private-host; then
- relayhost="[mail.messagingengine.com]:587"
-else
- # ses initially suggests port 25, but I had problems connecting to that.
- relayhost="[email-smtp.us-west-2.amazonaws.com]:587"
-fi
+##### setup email
if isdeb; then
- s debconf-set-selections<<EOF
-postfix postfix/main_mailer_type select Satellite system
-postfix postfix/mailname string $host
-postfix postfix/relayhost string $relayhost
-EOF
-
- pi postfix
+ mail-setup exim4
else
- pi postfix
- # Settings from reading the output when installing on debian,
- # then seeing which were different in a default install on arch.
- # I assume the same works for fedora.
- postconfin <<EOF
-mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
-mailbox_size_limit = 0
-relayhost = $relayhost
-inet_interfaces = loopback-only
-EOF
+ # todo: probably broken
+ mail-setup postfix
+fi
- s systemctl enable postfix
- s systemctl start postfix
+#### ubuntu nicety
+if isubuntu; then
+ # disable crash report annoying dialogs.
+ s dd of=/etc/default/apport <<<'enabled=0'
fi
+###### setup time zone
+# fai sets this an old way that doesn't work for stretch.
+# no harm in setting it universally here.
+# using debconf-set-selection, the area gets reset to ETC
+# on my linode test machine after doing a dpkg-reconfigure, or a reinstall,
+# so we are using expect :(
+# I got a random error when running this, so I added a sleep
+# rather than trying to write a whole detect and wait loop.
+# E: Could not get lock /var/lib/dpkg/lock - open (11: Resource temporarily unavailable)
+# E: Unable to lock the administration directory (/var/lib/dpkg/), is another process using it?
+sleep 1
+# todo: this is not idempotent, it fails when running twice, due to prepopulated values.
+# check into unsetting them using debconf-set-selection.
+s apt-get -y install --no-install-recommends expect
+s expect <<EOF ||:
+set force_conservative 0
+spawn dpkg-reconfigure tzdata -freadline
+expect -nocase timeout {exit 1} "Geographic area:"
+send "\02512\r"
+expect -nocase timeout {exit 1} "Time zone:"
+send "\0255\r"
+expect eof
+exit
+EOF
-if isarch; then
- # install so it's build dependencies don't get removed.
- x=$(mktemp -d)
- pushd $x
- aurex emacs-git
- makepkg -si --noconfirm
- popd
- rm -rf $x
-else
- # to disable emacs git build,
- # s apt-get install emacs
- if $recompile; then
- /a/bin/buildscripts/emacs
- else
- /a/bin/buildscripts/emacs -r
- fi
-fi
-# todo, figure this out for arch if we ever try out gnome.
-if ! isarch; then
- # 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
+##### install emacs
+if has_x; 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 || /a/bin/buildscripts/emacs
+ fi
fi
- s mkdir -p $dir/PostLogin
- s command cp /a/bin/desktop-20-autostart.sh $dir/PostLogin/Default
- s mkdir /etc/lightdm/lightdm.conf.d
- s dd of=/etc/lightdm/lightdm.conf.d/12-ian.conf <<'EOF'
-[SeatDefaults]
-session-setup-script=/a/bin/desktop-20-autostart.sh
-EOF
fi
-if isubuntu; then
- # disable crash report annoying crap
- s dd of=/etc/default/apport <<<'enabled=0'
+##### install laptop hardware packages
+if tp || x2 || x3; then
+ case $distro in
+ debian)
+ pi task-laptop
+ ;;
+ ubuntu|trisquel)
+ # the exact packages that task-laptop would install, since ubuntu
+ # doesn\'t have this virtual in practice package.
+ pi avahi-autoipd bluetooth powertop iw wireless-tools wpasupplicant
+ ;;
+ # todo: other distros unknown
+ esac
fi
-pi ghc sakura
-# todo, also note for work comp, scp opt/org-mode bin/build-scripts
-
-# use the package manger version to install the cabal version
-pi cabal-install
-cabal update
-PATH="$PATH:$HOME/.cabal/bin"
-
-# trying out the distro's versions newer distros
-if isdebian-stable || isubuntu; then
- # todo: on ubuntu 12.04, needed to install zlib1g-dev
- cabal install cabal-install
- pu cabal-install
- # just guessed at this after getting /bin/ld cannot find -lHSmtl or something
- t ~/.ghc
-
-
- cabal update
- # todo, work machine required some packages libx11-dev libxrandr-dev libxft2-dev
- cabal install xmonad
- cabal install xmonad-contrib
- # work machine:
- # pi tasksel. select openssh server, basic server, large font selection
-
- #http://comments.gmane.org/gmane.comp.lang.haskell.xmonad/13871
- cat <<'EOF'
-manual steps required:
-xfce, "Session and Startup" > "Application Autostart"
-Add
-Name: xmonad
-Description: xmonad --replace
-Command: delayed-xmonad
-EOF
-
-else
- pi xmonad
+##### install xmonad
+if has_x; then
+ pi ${p2[@]}
+ # note: on older ubuntu I used cabal xmonad + xfce, using cabal versin
+ # see /w/archive/programming/xmonad-cabal.sh
if isarch; then
- # for displaying error messages.
+ # xorg-xmessage for displaying error messages.
# optional dependency in arch, standard elsewhere.
- pi xorg-xmessage xmonad-contrib xorg-xsetroot xorg-xinit
-
- # https://wiki.archlinux.org/index.php/Xinitrc
- cp /etc/X11/xinit/xinitrc ~/.xinitrc
- sed -ri '/^ *twm\b/,$d' ~/.xinitrc
- echo "source /a/bin/xinitrc" >> ~/.xinitrc
+ pi xorg-server xorg-xmessage xmonad-contrib xorg-xsetroot xorg-xinit
else
pi suckless-tools
fi
fi
-pi dmenu
-if isdeb && (tp || x2); then
- pi task-laptop
+
+##### setup X autostart
+if has_x; then
+ if isarch; then
+ # https://wiki.archlinux.org/index.php/Xinitrc
+ for homedir in /home/*; do
+ cp /etc/X11/xinit/xinitrc $homedir/.xinitrc
+ $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
+ if isdeb; then
+ dir=/etc/gdm3
+ elif isfedora; then
+ # fedora didn\'t have the 3.
+ dir=/etc/gdm
+ fi
+ 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
+ s 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
+
+
+#### refix interactive ssh terminal
+# the first pup command can kill off our /etc/ mod, so rerun this
+/a/exe/ssh-emacs-setup
+
+
+echo "$0: $(date): ending now"
+exit 0
iankelling.org / git / distro-setup / blobdiff