GitList

Browse code

XenAPI: Always update proxy settings

If a user wants to re-use an xva just with different proxy settings, he
can now do it, as this change will always update /etc/apt/apt.conf to
reflect the settings in the user's localrc.

Change-Id: I8a6e9c88304bc887ea8269d946e89a5ba258b126

Mate Lakat authored on 2014/10/16 22:40:03
Showing 1 changed files

tools/xen/prepare_guest_template.sh

History View file @ e35785d

@@ -118,3 +118,10 @@ deb-src http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security univer
                      deb http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security multiverse
                      deb-src http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security multiverse
                      EOF
+                    +
                     +rm -f $STAGING_DIR/etc/apt/apt.conf
                     +if [ -n "$UBUNTU_INST_HTTP_PROXY" ]; then
                     +    cat > $STAGING_DIR/etc/apt/apt.conf << EOF
                     +Acquire::http::Proxy "$UBUNTU_INST_HTTP_PROXY";
                     +EOF
                     +fi