X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FUBUNTU%2F90-apt;h=440ffb264d6433173382e069e1fe667807802d48;hb=fe81034ee9664d8e131bac218b40d99a58a31649;hp=072e5603199f94dd25449857849f31e2d6920e3a;hpb=3bd65f0ca635f1349626c2393a4dd8a50df64f54;p=automated-distro-installer

diff --git a/fai/config/scripts/UBUNTU/90-apt b/fai/config/scripts/UBUNTU/90-apt
index 072e560..440ffb2 100755
--- a/fai/config/scripts/UBUNTU/90-apt
+++ b/fai/config/scripts/UBUNTU/90-apt
@@ -1,18 +1,16 @@
 #! /bin/bash
 
+# iank: we already set mirrors, i dont want to have to add "external mirror"
+# to every sources.list. Leaving the rest of this file so future merges will flag up
+# changes easier
+exit 0
+
 # check if we already use an external mirror
 grep -q "external mirror" $target/etc/apt/sources.list && exit 0
 
-dist=trusty
-
 cat <<EOM > $target/etc/apt/sources.list
 # external mirror
-deb MIRRORURL $dist main restricted universe multiverse
-deb MIRRORURL $dist-updates main restricted universe multiverse
-deb MIRRORURL $dist-security main restricted universe multiverse
+deb $ubuntumirror/ubuntu $ubuntudist main universe
+deb $ubuntumirror/ubuntu $ubuntudist-updates main universe
+deb $ubuntumirror/ubuntu $ubuntudist-security main universe
 EOM
-
-# determine a fast mirror for Ubuntu
-list=$(curl -s http://mirrors.ubuntu.com/mirrors.txt)
-mirror=$(netselect $list | awk '{print $2}')
-sed -i -e "s#MIRRORURL#$mirror#" $target/etc/apt/sources.list