iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes and config changes
[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 f08a23dbab3686f28e736f5a71a169232bda705b..440ffb264d6433173382e069e1fe667807802d48 100755
(executable)
--- a/
fai/config/scripts/UBUNTU/90-apt
+++ b/
fai/config/scripts/UBUNTU/90-apt
@@
-1,25
+1,16
@@
#! /bin/bash
#! /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
# 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 mult
iverse
-deb
MIRRORURL $ubuntudist-updates main restricted universe mult
iverse
-deb
MIRRORURL $ubuntudist-security main restricted universe mult
iverse
+deb
$ubuntumirror/ubuntu $ubuntudist main un
iverse
+deb
$ubuntumirror/ubuntu $ubuntudist-updates main un
iverse
+deb
$ubuntumirror/ubuntu $ubuntudist-security main un
iverse
EOM
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