X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=deab6797c5e5ca4c225d35f2438a426dc01083d8;hb=4d23584c79e6c519f24042b11bc2cb5cd04ea284;hp=ecc093e09153a1c6117d67358b58087c797bdbc4;hpb=bfd6bbd3a188aac6871f8b5e1116a0979682d52b;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index ecc093e..deab679 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -24,10 +24,10 @@ fi
 # -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 (without B)
-fcopy -riB /root
-fcopy -riB /usr/local/bin
+fcopy -riBM /root
+fcopy -riBM /usr/local/bin
 
 
 src=$FAI/distro-install-common/shadow
@@ -49,6 +49,14 @@ tmpfile1=$(mktemp)
 # this can fail if we need an apt update
 chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 ||:
 fcopy -riBM /etc/apt
+
+# vps that didnt start with fai need the key
+case $HOSTNAME in
+  je|bk|li)
+    apt-key add /a/bin/fai/fai/config/package_config/UBUNTU.asc
+    ;;
+esac
+
 tmpfile2=$(mktemp)
 chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile2
 if ! diff -q $tmpfile1 $tmpfile2; then
@@ -215,7 +223,7 @@ EOF
 fi
 
 # use networkmanager if this host has wireless.
-if type -p iw &>/dev/null && [[ $(iw dev) ]]; then
+if [[ $HOSTNAME == bo ]] || type -p iw &>/dev/null && [[ $(iw dev) ]]; then
   chroot $FAI_ROOT bash <<EOF
 apt-get -y install network-manager
 EOF
@@ -240,6 +248,8 @@ auto lo eth0
 iface lo inet loopback
 iface eth0 inet static
 address 10.3.0.2/16
+
+source-directory /etc/network/interfaces.d
 EOF
   fi
 
@@ -250,6 +260,8 @@ auto lo eth0
 iface lo inet loopback
 iface eth0 inet dhcp
 iface eth0 inet6 auto
+
+source-directory /etc/network/interfaces.d
 EOF
 
   # previously had an else condition after
@@ -296,6 +308,8 @@ gateway fe80::1
 iface eth0 inet6 static
 # from a requested /64 pool
 address 2600:3c00:e000:280::2/64
+
+source-directory /etc/network/interfaces.d
 EOF
   fi
 fi
@@ -324,24 +338,32 @@ 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
+if ! [[ -s /home/iank/.ssh/authorized_keys ]]; then
+  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
 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
+
+# old link from
+# # https://ticktockhouse.svbtle.com/my-obligatory-ubuntu-ssh-agent-post
+# but that made a service that started too soon and didn't pick up our
+# x env vars. instead, copy from the root ssh-agent just the
+# appropriate things into a new service.
+rm -f /home/iank/.config/systemd/user/default.target.wants/ssh-agent.service
+
+rm -f /home/iank/.local/share/systemd/user/sshaiank.service \
+  /home/iank/.config/systemd/user/default.target.wants/sshaiank.service
+
 #### end .ssh setup ###
 
 ## duplicated in ssh-emacs-setup
@@ -351,7 +373,7 @@ f=/etc/ssh/sshd_config
 grep -xFq "$line" $f || tee -a $f <<<"$line"
 
 
-# default debian groups (jessie through buster) + adm, sudo, root, admin
+# default debian groups (jessie through buster) + adm, root, admin
 for g in cdrom floppy audio dip video plugdev netdev adm sudo admin; do
   if getent group $g >/dev/null; then
     usermod -aG $g iank