From: Chris Glass <tribaal@gmail.com>
Date: Wed, 15 Jan 2014 15:37:46 +0000 (+0100)
Subject: Fix small mistake with squid-deb-proxy hook
X-Git-Tag: lxc-1.0.0.beta2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=959dd8f250a49bd8b3503a7b5f90a242ece5843d;p=thirdparty%2Flxc.git

Fix small mistake with squid-deb-proxy hook

I unfortunately realized that I did not push the latest version of the
file. This fixes an issue in the case where we want to create the proxy
file in the container (not nested).

Signed-off-by: Chris Glass <tribaal@gmail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/hooks/squid-deb-proxy-client b/hooks/squid-deb-proxy-client
index 7d23d2961..3faac04df 100755
--- a/hooks/squid-deb-proxy-client
+++ b/hooks/squid-deb-proxy-client
@@ -24,10 +24,10 @@
 
 discovery_script=/usr/share/squid-deb-proxy-client/apt-avahi-discover
 proxy_file=/etc/apt/apt.conf.d/50squid-deb-proxy
+container_proxy_file=$LXC_ROOTFS_PATH$proxy_file
 
 if [ -f $proxy_file ]; then
     # The host has a proxy file - let's propagate the config to the guest.
-    container_proxy_file=$LXC_ROOTFS_PATH$proxy_file
     cat $proxy_file > $container_proxy_file
     exit 0
 fi