update to upstream 5.3.4

[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 072e5603199f94dd25449857849f31e2d6920e3a..f08a23dbab3686f28e736f5a71a169232bda705b 100755 (executable)
--- a/fai/config/scripts/UBUNTU/90-apt
+++ b/fai/config/scripts/UBUNTU/90-apt
@@ -1,15 +1,22 @@
 #! /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
 
-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 MIRRORURL $ubuntudist main restricted universe multiverse
+deb MIRRORURL $ubuntudist-updates main restricted universe multiverse
+deb MIRRORURL $ubuntudist-security main restricted universe multiverse
 EOM
 
 # determine a fast mirror for Ubuntu