sudo apt-get -y install fai-client
fi
+if [[ -e /a/bin/fai/fai-wrapper ]]; then
+ chroot() {
+ shift
+ "$@"
+ }
+fi
+
chroot $FAI_ROOT bash <<'EOFOUTER'
+set -eE -o pipefail
if getent group systemd-journal >/dev/null; then
# makes the journal be saved to disk.
mkdir -p /var/log/journal
# -r = recursive
# -i = ignore non-matching class warnings, always exit 0
# -B = no backup files
-fcopy -riB /boot
+fcopy -riBM /boot
# this is also done by FABASE/10-misc by default.
-fcopy -riB /root
+fcopy -riBM /root
src=$FAI/distro-install-common/shadow
$FAI/distro-install-common/end
if ifclass VOL_STRETCH_BOOTSTRAP; then
- fcopy -ri /etc/systemd/system
+ fcopy -riM /etc/systemd/system
chroot $FAI_ROOT bash <<'EOFOUTER'
systemctl enable fai_check.service
EOFOUTER
# these get copied in an earlier stage by fai, but leaving it here since
# I run this as a single post-fai script to update things that have changed.
-fcopy -riB /etc/apt
+fcopy -riBM /etc/apt
# outside of fai, this seems to regularly lead to
# E: Could not get lock /var/lib/apt/lists/lock - open (11: Resource temporarily unavailable)
# so add a sleep. 1 sec is probably way more than needed.
sleep 1
-$ROOTCMD apt-get update
+f=$FAI_ROOT/var/cache/apt/pkgcache.bin
+if [[ ! -r $f ]] || (( $(( $(date +%s) - $(stat -c %Y $f ) )) > 60*60*2 )); then
+ i=0
+ while fuser $FAI_ROOT/var/lib/dpkg/lock &>/dev/null; do
+ sleep 1
+ i=$(( i+1 ))
+ if (( i > 300 )); then
+ echo "error: timed out waiting for /var/lib/dpkg/lock" >&2
+ exit 1
+ fi
+ $ROOTCMD apt-get update
+ done
+fi
chroot $FAI_ROOT bash <<'EOF'
#### begin .ssh setup ###
+set -x
set -eE -o pipefail
mkdir -p /home/iank/.ssh
f=/root/.ssh/authorized_keys
cp -rL /home/iank/.ssh /root
chown -R root:root /root/.ssh
chmod 700 /root/.ssh
+# https://ticktockhouse.svbtle.com/my-obligatory-ubuntu-ssh-agent-post
+# systemctl --user is not available at fai time, so create the link ourselves
+d=/home/iank/.config/systemd/user/default.target.wants
+sudo -u iank mkdir -p $d
+sudo -u iank ln -sf /usr/lib/systemd/user/ssh-agent.service $d
#### end .ssh setup ###
-# this is needed to enable resolvconf, making /etc/resolv.conf be a symlink.
-# why? i dun know, it\'s really dumb.
-dpkg-reconfigure -fnoninteractive resolvconf
+### duplicated in ssh-emacs-setup
+# done here so its setup earlier for convenience
+line='AcceptEnv INSIDE_EMACS BRC COLUMNS'
+f=/etc/ssh/sshd_config
+grep -xFq "$line" $f || tee -a $f <<<"$line"
+
+
+
# default jessie groups + kvm, systemd-journal, adm
-usermod -aG adm,cdrom,floppy,sudo,audio,dip,video,plugdev,netdev iank
+for g in adm cdrom floppy sudo audio dip video plugdev netdev; do
+ if getent gropu $g >/dev/null; then
+ usermod -aG $g iank
+ fi
+done
if getent group systemd-journal >/dev/null; then
usermod -aG systemd-journal iank
if [[ $FAI_ACTION != dirinstall ]]; then
- cat >$FAI_ROOT/etc/grub.d/40_custom <<'EOF'
+
+ # luks options, see man systemd-cryptsetup-generator
+ # all i know is that with luks.crypttab=no, swap still timed out on boot.
+ # and with rd.luks.crypttab=no, it works.
+ if ifclass LINODE; then
+ speed=19200
+ cmdline="rd.luks.crypttab=no net.ifnames=0 console=ttyS0,${speed}n8"
+ else
+ speed=115200
+ cmdline="rd.luks.crypttab=no net.ifnames=0 console=ttyS0,${speed}n8 console=tty0"
+ fi
+
+ cat >$FAI_ROOT/etc/grub.d/40_custom <<EOF
#!/bin/sh
-exec tail -n +3 $0
+exec tail -n +3 \$0
# This file provides an easy way to add custom menu entries. Simply type the
# menu entries you want to add after this comment. Be careful not to change
# the 'exec tail' line above.
# https://www.coreboot.org/Serial_console # tty
# but removed unneeded stuff
-serial --speed=115200
+serial --speed=$speed
terminal_input --append serial
terminal_output --append serial
EOF
- chroot $FAI_ROOT bash <<'EOF'
+
+ chroot $FAI_ROOT bash <<EOF
+set -eE -o pipefail
# https://askubuntu.com/questions/33416/how-do-i-disable-the-boot-splash-screen-and-only-show-kernel-and-boot-text-inst
-# it suggests not having plymouth-theme-ubuntu-text, but
-# making it not installed then kills plymouth, then makes
-# the system not boot.
-sed -ri 's/(^ *GRUB_CMDLINE_LINUX.*)quiet splash/\1/' /etc/default/grub
-
-# todo: not sure, but this might screw up systems without a serial port
-# and thus need a conditional.
-sed -ri 's/^ *GRUB_CMDLINE_LINUX_DEFAULT="/\0console=ttyS0,115200 console=tty0 /' /etc/default/grub
+# we remove quiet and splash, and all thats left is what we want
+
+if grep -qF "$cmdline" /etc/default/grub; then
+ # already set things, exit
+ exit 0
+fi
+sed -ri 's/^ *GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="$cmdline"/' /etc/default/grub
# on xenial, no grub is displayed at all. fix that.
# found just by noticing this in the config file, and a
# warning about it in error.log
update-grub2
EOF
-fi
+fi # end != dirinstall
-# reading through the groups that iank is in but traci isn't,
+# reading through the groups that iank is in but user2 isn't,
for g in plugdev audio video cdrom; do
- $ROOTCMD usermod -a -G $g traci
+ $ROOTCMD usermod -a -G $g user2
done
+
+
+## begin network setup
+
+# use old names. the idea of them changing between boots has never
+# happened to me and I usually only have 1 wired or other type.
+# If I ever do need to care about it, I will.
+# Strangely this didn't work on kw, so I added kernel cmdline parameter.
+# https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/
+ln -sf /dev/null $target/etc/systemd/network/99-default.link
+
+# use networkmanager if this host has wireless.
+if [[ $(iw dev) ]]; then
+ chroot $FAI_ROOT bash <<EOF
+apt-get -y install network-manager
+EOF
+
+ # allow networkmanager to manage interfaces
+ #https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1638842
+ touch $target/etc/NetworkManager/conf.d/10-globally-managed-devices.conf
+ # in a default desktop install, it looks like netplan creates this file under
+ # run/NetworkManager/conf.d in early boot.
+
+ # By default, dns=default is set in etiona, and dns is just broken.
+ # Maybe with resolvconf it would work, but theres no need for that.
+ # https://wiki.gnome.org/Projects/NetworkManager/DNS
+ cat >$target/etc/NetworkManager/conf.d/99-iank.conf <<'EOF'
+[main]
+dns=systemd-resolved
+EOF
+
+else
+ cat > $target/etc/network/interfaces <<-EOF
+# generated by FAI
+auto lo eth0
+iface lo inet loopback
+iface eth0 inet dhcp
+iface eth0 inet6 auto
+EOF
+
+# previously had an else condition after
+#elif ifclass VM || ifclass LINODE; then
+# iface br0 inet dhcp
+# bridge_ports $NIC1
+# bridge_stp off
+# bridge_maxwait 0
+# however, on t9, on startup, br0, became
+# rename1 and didn't come up. i dunno why,
+# but the bridge is for vms that I rarely use,
+# so not bothering to figure it out.
+
+
+fi
+
+if ifclass LINODE; then
+ mkdir -p $target/etc/initramfs-tools/conf.d
+ cat >$target/etc/initramfs-tools/conf.d/mine <<EOF
+# dhcp in initramfs doesn't work on linode. i dunno why, whatever.
+# man 5 initramfs.conf
+# /usr/share/doc/klibc-utils/README.ipconfig.gz
+# /usr/share/initramfs-tools/scripts/functions
+IP=$linode_ip::$linode_gw:255.255.255.0::eth0:off
+EOF
+fi
+
+# I prefer to stick with ifup/down for now. a. networkd is not in its
+# own package, so cant use in other init systems. b. it works fine.
+chroot $FAI_ROOT bash <<EOF
+systemctl disable systemd-networkd.socket systemd-networkd networkd-dispatcher systemd-networkd-wait-online
+systemctl mask systemd-networkd.socket systemd-networkd networkd-dispatcher systemd-networkd-wait-online
+EOF
+
+
+## end network setup
iankelling.org / git / automated-distro-installer / blobdiff