Browse code

Merge "XenAPI: Always update proxy settings"

Jenkins authored on 2014/10/31 19:30:42
Showing 1 changed files
... ...
@@ -118,3 +118,10 @@ deb-src http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security univer
118 118
 deb http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security multiverse
119 119
 deb-src http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security multiverse
120 120
 EOF
121
+
122
+rm -f $STAGING_DIR/etc/apt/apt.conf
123
+if [ -n "$UBUNTU_INST_HTTP_PROXY" ]; then
124
+    cat > $STAGING_DIR/etc/apt/apt.conf << EOF
125
+Acquire::http::Proxy "$UBUNTU_INST_HTTP_PROXY";
126
+EOF
127
+fi