misc new stuff

[automated-distro-installer] / fai / config / scripts / GRUB_PC / 11-iank

diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank
index deab6797c5e5ca4c225d35f2438a426dc01083d8..954afd4a3c1fa7c1622e05eff2092d496930f56f 100755 (executable)
--- 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