X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FUBUNTU%2F90-apt;h=15ac4bb7bfd60a8fc20a635f1cedd9525417f55d;hb=f8e7e925a0eba5b0091354ccf26842bcfda9b84e;hp=b75555b6de01cdf85480e11c83f05c250a165083;hpb=a6f3eaed0a1eebb5c58853fb9faa8bfbec404de3;p=automated-distro-installer

diff --git a/fai/config/scripts/UBUNTU/90-apt b/fai/config/scripts/UBUNTU/90-apt
index b75555b..15ac4bb 100755
--- a/fai/config/scripts/UBUNTU/90-apt
+++ b/fai/config/scripts/UBUNTU/90-apt
@@ -1,16 +1,20 @@
 #! /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
+
 # 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 MIRRORURL $ubuntudist main restricted universe multiverse
-deb MIRRORURL $ubuntudist-updates main restricted universe multiverse
-deb MIRRORURL $ubuntudist-security main restricted universe multiverse
+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
 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