X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=954afd4a3c1fa7c1622e05eff2092d496930f56f;hb=2420e8ef73db49cfebe94bf1db85a0676b0e6b4a;hp=e27260e76065f0c77c02b71a8e8a8647bde33686;hpb=b5aa031e877e295b016d26b01803a719feb7e051;p=automated-distro-installer

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index e27260e..954afd4 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -24,10 +24,15 @@ 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
+
+# this gets done by fai, but just happens too often that
+# I add sources due to new distros, whatever.
+fcopy -riBM /etc/apt/preferences.d
+fcopy -riBM /etc/apt/sources.list.d
 
 
 src=$FAI/distro-install-common/shadow
@@ -49,6 +54,10 @@ tmpfile1=$(mktemp)
 # this can fail if we need an apt update
 chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 ||:
 fcopy -riBM /etc/apt
+
+# get ubuntu key, for running from fai wrapper.
+apt-key add $FAI/package_config/UBUNTU.asc
+
 tmpfile2=$(mktemp)
 chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile2
 if ! diff -q $tmpfile1 $tmpfile2; then
@@ -215,7 +224,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
@@ -353,22 +362,8 @@ fi
 # appropriate things into a new service.
 rm -f /home/iank/.config/systemd/user/default.target.wants/ssh-agent.service
 
-mkdir -p /home/iank/.local/share/systemd/user
-cat >/home/iank/.local/share/systemd/user/sshaiank.service <<'EOF'
-[Unit]
-Description=OpenSSH User Agent
-Documentation=man:ssh-agent(1)
-[Service]
-ExecStart=/usr/lib/openssh/agent-launch start
-ExecStopPost=/usr/lib/openssh/agent-launch stop
-[Install]
-WantedBy=default.target
-EOF
-# enable it
-# systemctl --user is not available at fai time, so create the link ourselves
-dir=/home/iank/.config/systemd/user/default.target.wants
-mkdir -p $dir
-ln -sf /home/iank/.local/share/systemd/user/sshaiank.service $dir
+rm -f /home/iank/.local/share/systemd/user/sshaiank.service \
+  /home/iank/.config/systemd/user/default.target.wants/sshaiank.service
 
 #### end .ssh setup ###
 
@@ -379,7 +374,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