Merge branch 'upstream'

[automated-distro-installer] / fai / config / scripts / UBUNTU / 90-apt

diff --git a/fai/config/scripts/UBUNTU/90-apt b/fai/config/scripts/UBUNTU/90-apt
index 15ac4bb7bfd60a8fc20a635f1cedd9525417f55d..440ffb264d6433173382e069e1fe667807802d48 100755 (executable)
--- a/fai/config/scripts/UBUNTU/90-apt
+++ b/fai/config/scripts/UBUNTU/90-apt
@@ -1,20 +1,16 @@
 #! /bin/bash
 
-if ifclass GERMAN; then
-    $ROOTCMD locale-gen    LANG=de_DE.UTF-8
-    $ROOTCMD update-locale LANG=de_DE.UTF-8
-else
-    ainsl -v /etc/locale.gen '^en_US.UTF-8 UTF-8'
-    $ROOTCMD locale-gen
-    $ROOTCMD update-locale LANG=en_US.UTF-8
-fi
+# 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
 
 cat <<EOM > $target/etc/apt/sources.list
 # external mirror
-deb $ubuntumirror/ubuntu $ubuntudist main restricted universe multiverse
-deb $ubuntumirror/ubuntu $ubuntudist-updates main restricted universe multiverse
-deb $ubuntumirror/ubuntu $ubuntudist-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