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

diff --git a/fai/config/scripts/UBUNTU/90-apt b/fai/config/scripts/UBUNTU/90-apt
index 682d572..440ffb2 100755
--- a/fai/config/scripts/UBUNTU/90-apt
+++ b/fai/config/scripts/UBUNTU/90-apt
@@ -1,7 +1,16 @@
 #! /bin/bash
 
-# ian: just taking part of the corresponding fai example script
+# 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
 
-ainsl -v /etc/locale.gen '^en_US.UTF-8 UTF-8'
-$ROOTCMD locale-gen
-$ROOTCMD update-locale LANG=en_US.UTF-8
+# check if we already use an external mirror
+grep -q "external mirror" $target/etc/apt/sources.list && exit 0
+
+cat <<EOM > $target/etc/apt/sources.list
+# external mirror
+deb $ubuntumirror/ubuntu $ubuntudist main universe
+deb $ubuntumirror/ubuntu $ubuntudist-updates main universe
+deb $ubuntumirror/ubuntu $ubuntudist-security main universe
+EOM