add rescue, fix default pxe, ubuntu locale

[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
old mode 100755 (executable)
new mode 100644 (file)
index 072e560..5e2d1e3
--- a/fai/config/scripts/UBUNTU/90-apt
+++ b/fai/config/scripts/UBUNTU/90-apt
@@ -1,18 +1,10 @@
 #! /bin/bash
 
-# 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
-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
+# 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.
+
+ainsl -v /etc/locale.gen '^en_US.UTF-8 UTF-8'
+$ROOTCMD locale-gen
+$ROOTCMD update-locale LANG=en_US.UTF-8