# -r = recursive
# -i = ignore non-matching class warnings, always exit 0
# -B = no backup files
-fcopy -riBM /boot
-# this is also done by FABASE/10-misc by default.
-fcopy -riBM /root
+fcopy -riB /boot
+# this is also done by FABASE/10-misc by default (without B)
+fcopy -riB /root
src=$FAI/distro-install-common/shadow
-if ifclass VOL_BUSTER_BOOTSTRAP; then
- fcopy -riM /etc/systemd/system
- chroot $FAI_ROOT bash <<'EOFOUTER'
-systemctl enable fai_check.service
-EOFOUTER
- exit 0 # avoid unnecessary stuff in bootstrap vol
-fi
-
-
+### begin sources install + updates
# 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.
tmpfile1=$(mktemp)
if ! diff -q $tmpfile1 $tmpfile2; then
chroot $FAI_ROOT /usr/bin/apt update
fi
-
# 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.
$ROOTCMD apt-get update
done
fi
-
+### end sources install + updates
#### misc configurations
EOF
apt-get install -y pxe-kexec
-
-#### begin .ssh setup ###
-set -x
-set -eE -o pipefail
-mkdir -p /home/iank/.ssh
-f=/root/.ssh/authorized_keys
-if [[ -e $f ]]; then
- cp $f /home/iank/.ssh
-fi
-chown -R 1000:1000 /home/iank/.ssh
-chmod -R u=Xrw,og= /home/iank/.ssh
-rm -rf /root/.ssh
-# remove broken symlinks or the following cp will fail
-find /home/iank/.ssh -xtype l -exec rm '{}' \;
-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 ###
-
-## 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 debian groups (jessie through buster) + adm, sudo, root
-for g in cdrom floppy audio dip video plugdev netdev adm sudo; 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
-fi
-
-
# this is usefull. Only thing reason I see this being disabled by default is
# that a normal user can disrupt the system, eg cause a reboot.
sed -i '$a kernel.sysrq=1
/^kernel.sysrq=/d' /etc/sysctl.conf
-EOFOUTER
-
-
-rm -f $target/etc/resolv.conf
-ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf
-# needed for bitfolk image
-if [[ -e /a/bin/fai/fai-wrapper ]]; then
- systemctl enable systemd-resolved
- systemctl start systemd-resolved
-fi
-
-# bitfolk installer handles the rest
-case $HOSTNAME in
- bk|je) exit 0 ;;
-esac
+EOFOUTER
if [[ $FAI_ACTION != dirinstall ]] && ! ifclass NOCRYPT; then
fi ##### end != dirinstall && != NOCRYPT
-# 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 user2
-done
-
-
-
###### begin network setup ####
# use old names. the idea of them changing between boots has never
# 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.
+# bitfolk installer handles the rest
+case $HOSTNAME in
+ bk|je) exit 0 ;;
+esac
+
+
+# use networkmanager if this host has wireless.
if type -p iw &>/dev/null && [[ $(iw dev) ]]; then
chroot $FAI_ROOT bash <<EOF
apt-get -y install network-manager
EOF
##### end network setup #####
+
+
+if ifclass VOL_BUSTER_BOOTSTRAP; then
+ fcopy -riM /etc/systemd/system
+ chroot $FAI_ROOT bash <<'EOFOUTER'
+systemctl enable fai_check.service
+EOFOUTER
+ exit 0 # avoid unnecessary stuff in bootstrap vol
+fi
+
+
+
+## misc settings
+chroot $FAI_ROOT bash <<'EOFOUTER'
+#### begin .ssh setup ###
+set -x
+set -eE -o pipefail
+mkdir -p /home/iank/.ssh
+f=/root/.ssh/authorized_keys
+if [[ -e $f ]]; then
+ cp $f /home/iank/.ssh
+fi
+chown -R 1000:1000 /home/iank/.ssh
+chmod -R u=Xrw,og= /home/iank/.ssh
+rm -rf /root/.ssh
+# remove broken symlinks or the following cp will fail
+find /home/iank/.ssh -xtype l -exec rm '{}' \;
+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 ###
+
+## 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 debian groups (jessie through buster) + adm, sudo, root
+for g in cdrom floppy audio dip video plugdev netdev adm sudo; 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
+fi
+EOFOUTER
+
+rm -f $target/etc/resolv.conf
+ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf
+# needed for bitfolk image
+if [[ -e /a/bin/fai/fai-wrapper ]]; then
+ systemctl enable systemd-resolved
+ systemctl start systemd-resolved
+fi
+
+
+
+# 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 user2
+done
iankelling.org / git / automated-distro-installer / blobdiff