Use configured apt_proxy in guests.

etc/xen-tools.conf

@@ -278,7 +278,8 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # mirror_maverick = http://archive.ubuntu.com/ubuntu
 # mirror_natty = http://archive.ubuntu.com/ubuntu
 
-# If this is defined it will be used by debootstrap
+# If this is defined it will be used by debootstrap, and configured as the
+# proxy for the guest
 #
 # apt_proxy =
 

hooks/dapper/20-setup-apt

@@ -33,9 +33,12 @@ logMessage Script $0 starting
 # replicate that setup in our new guest via apt-config dump and save
 # the setting to the proxy guess file.
 #
-logMessage The use of a proxy detected.
-apt-config dump | grep -i Acquire::HTTP::Proxy \
-    > ${prefix}/etc/apt/apt.conf.d/proxy-guess
+if [ ${apt_proxy} ]; then
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+else
+  logMessage The use of a proxy detected.
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+fi
 
 
 #

hooks/debian/20-setup-apt

@@ -32,9 +32,12 @@ logMessage Script $0 starting
 # replicate that setup in our new guest via apt-config dump and save
 # the setting to the proxy guess file.
 #
-logMessage The use of a proxy detected.
-apt-config dump | grep -i Acquire::HTTP::Proxy \
-    > ${prefix}/etc/apt/apt.conf.d/proxy-guess
+if [ ${apt_proxy} ]; then
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+else
+  logMessage The use of a proxy detected.
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+fi
 
 
 #

hooks/edgy/20-setup-apt

@@ -33,9 +33,12 @@ logMessage Script $0 starting
 # replicate that setup in our new guest via apt-config dump and save
 # the setting to the proxy guess file.
 #
-logMessage The use of a proxy detected.
-apt-config dump | grep -i Acquire::HTTP::Proxy \
-    > ${prefix}/etc/apt/apt.conf.d/proxy-guess
+if [ ${apt_proxy} ]; then
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+else
+  logMessage The use of a proxy detected.
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+fi
 
 
 #

hooks/intrepid/20-setup-apt

@@ -33,9 +33,12 @@ logMessage Script $0 starting
 # replicate that setup in our new guest via apt-config dump and save
 # the setting to the proxy guess file.
 #
-logMessage The use of a proxy detected.
-apt-config dump | grep -i Acquire::HTTP::Proxy \
-    > ${prefix}/etc/apt/apt.conf.d/proxy-guess
+if [ ${apt_proxy} ]; then
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+else
+  logMessage The use of a proxy detected.
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+fi
 
 
 #

hooks/karmic/20-setup-apt

@@ -33,9 +33,12 @@ logMessage Script $0 starting
 # replicate that setup in our new guest via apt-config dump and save
 # the setting to the proxy guess file.
 #
-logMessage The use of a proxy detected.
-apt-config dump | grep -i Acquire::HTTP::Proxy \
-    > ${prefix}/etc/apt/apt.conf.d/proxy-guess
+if [ ${apt_proxy} ]; then
+  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
+else
+  logMessage The use of a proxy detected.
+  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
+fi
 
 
 #