X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F11-iank;h=954afd4a3c1fa7c1622e05eff2092d496930f56f;hp=deab6797c5e5ca4c225d35f2438a426dc01083d8;hb=6ca069946c8ff88d79d1ae421e0eda60ae1c514c;hpb=9553b1b421623b7c51b0b0ad1fe860efc017745c

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index deab679..954afd4 100755
--- a/fai/config/scripts/GRUB_PC/11-iank
+++ b/fai/config/scripts/GRUB_PC/11-iank
@@ -29,6 +29,11 @@ fcopy -riBM /boot
 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
 dst=/q/root/shadow
@@ -50,12 +55,8 @@ tmpfile1=$(mktemp)
 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
+# 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