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

diff --git a/fai/config/scripts/UBUNTU/90-apt b/fai/config/scripts/UBUNTU/90-apt
old mode 100644
new mode 100755
index 5e2d1e3..440ffb2
--- a/fai/config/scripts/UBUNTU/90-apt
+++ b/fai/config/scripts/UBUNTU/90-apt
@@ -1,10 +1,16 @@
 #! /bin/bash
 
-# note: the name of this scripts doesn't fit it's contents, but it's
-# because we are taking just part of the corresponding fai example
-# script, and it's easier to keep up with upstream changes if the file
-# name is the same.
+# 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