]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Create the apt proxy in the cache instead of the 1st container
authorSimon Deziel <simon.deziel@gmail.com>
Sun, 19 Oct 2014 02:20:23 +0000 (22:20 -0400)
committerStéphane Graber <stgraber@ubuntu.com>
Mon, 27 Oct 2014 21:39:24 +0000 (17:39 -0400)
This addresses https://github.com/lxc/lxc/issues/280.

Signed-off-by: Simon Deziel <simon@sdeziel.info>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
templates/lxc-ubuntu.in

index 7768357727622ca890a70f58383fd18ed2ff4d3c..bbe7f7d6f3b715d3b943918c444d6b072c8edba9 100644 (file)
@@ -259,13 +259,13 @@ choose_container_proxy()
 
 write_sourceslist()
 {
-    # $1 => path to the rootfs
+    # $1 => path to the partial cache or the rootfs
     # $2 => architecture we want to add
     # $3 => whether to use the multi-arch syntax or not
 
     if [ -n "$APT_PROXY" ]; then
-        mkdir -p $rootfs/etc/apt/apt.conf.d
-        cat > $rootfs/etc/apt/apt.conf.d/70proxy << EOF
+        mkdir -p $1/etc/apt/apt.conf.d
+        cat > $1/etc/apt/apt.conf.d/70proxy << EOF
 Acquire::http::Proxy "$APT_PROXY" ;
 EOF
     fi