From: Gu1 <gu1@aeroxteam.fr>
Date: Tue, 28 Oct 2014 01:14:28 +0000 (+0100)
Subject: lxc-debian: Fix default mirrors
X-Git-Tag: lxc-1.1.0.alpha3~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d20559cff01c773fe3b84d8697f0137b13938a5;p=thirdparty%2Flxc.git

lxc-debian: Fix default mirrors

Fix a typo in the lines inserted in the default sources.list.
Change the default mirror to http.debian.net which is (supposedly) more
accurate and better than cdn.debian.net for a generic configuration.
Use security.debian.org directly for the {release}/updates repository.

Signed-off-by: Gu1 <gu1@aeroxteam.fr>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index dc2ae939b..5ffbe2163 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -33,8 +33,8 @@ done
 # Make sure the usual locations are in PATH
 export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
 
-MIRROR=${MIRROR:-http://cdn.debian.net/debian}
-SECURITY_MIRROR=${SECURITY_MIRROR:-http://cdn.debian.net/debian-security}
+MIRROR=${MIRROR:-http://http.debian.net/debian}
+SECURITY_MIRROR=${SECURITY_MIRROR:-http://security.debian.org/}
 LOCALSTATEDIR="@LOCALSTATEDIR@"
 LXC_TEMPLATE_CONFIG="@LXCTEMPLATECONFIG@"
 
@@ -167,8 +167,8 @@ write_sourceslist()
     fi
 
     cat >> "${rootfs}/etc/apt/sources.list" << EOF
-${prefix} $MIRROR          ${release}        main contrib non-free
-${prefix} $SECURITY_MIRROR ${release}/update main contrib non-free
+${prefix} $MIRROR          ${release}         main contrib non-free
+${prefix} $SECURITY_MIRROR ${release}/updates main contrib non-free
 EOF
 }