From: Axel Beckert Date: Tue, 3 Aug 2010 13:59:10 +0000 (+0200) Subject: Use apt-config dump to determine Dom0's APT proxy settings. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0f99b8b995af49a4089748cd08986c07576ba481;p=people%2Fdariof%2Fxen-tools.git Use apt-config dump to determine Dom0's APT proxy settings. This is the official way, needs no own parsing (therefore less fault-prone) and shorter. Also fixes Debian bug #560011 -- the manual parsing did not catch all syntax variants. Also add some comments before /etc/apt/sources.list generation in the Ubuntu hooks. --- diff --git a/hooks/dapper/20-setup-apt b/hooks/dapper/20-setup-apt index 475f8c6..4fdd008 100755 --- a/hooks/dapper/20-setup-apt +++ b/hooks/dapper/20-setup-apt @@ -30,28 +30,17 @@ logMessage Script $0 starting # # Attempt to auto-magically detect the use of a Proxy for apt-get, and -# replicate that setup in our new guest. +# replicate that setup in our new guest via apt-config dump and save +# the setting to the proxy guess file. # -# -# Process any of the present apt-conf setup lines. -# -for i in /etc/apt/apt.conf /etc/apt/apt.conf.d/* ; do - - # - # If the file exists. (Need this in case the literal glob fails.) - # - if [ -e $i ] ; then - - # - # Save the matching line(s) to the proxy guess file. - # - logMessage The use of a proxy detected. - grep -i HTTP::Proxy $i >> ${prefix}/etc/apt/apt.conf.d/proxy-guess - fi -done - +logMessage The use of a proxy detected. +apt-config dump | grep -i Acquire::HTTP::Proxy \ + > ${prefix}/etc/apt/apt.conf.d/proxy-guess +# +# Setup the sources.list file for new installations of Ubuntu GNU/Linux. +# cat < ${prefix}/etc/apt/sources.list # # /etc/apt/sources.list diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt index 7f9dcfc..446cd67 100755 --- a/hooks/debian/20-setup-apt +++ b/hooks/debian/20-setup-apt @@ -29,26 +29,12 @@ logMessage Script $0 starting # # Attempt to auto-magically detect the use of a Proxy for apt-get, and -# replicate that setup in our new guest. +# replicate that setup in our new guest via apt-config dump and save +# the setting to the proxy guess file. # -# -# Process any of the present apt-conf setup lines. -# -for i in /etc/apt/apt.conf /etc/apt/apt.conf.d/* ; do - - # - # If the file exists. (Need this in case the literal glob fails.) - # - if [ -e $i ] ; then - - # - # Save the matching line(s) to the proxy guess file. - # - logMessage The use of a proxy detected. - grep -i HTTP::Proxy $i >> ${prefix}/etc/apt/apt.conf.d/proxy-guess - fi -done - +logMessage The use of a proxy detected. +apt-config dump | grep -i Acquire::HTTP::Proxy \ + > ${prefix}/etc/apt/apt.conf.d/proxy-guess # diff --git a/hooks/edgy/20-setup-apt b/hooks/edgy/20-setup-apt index a0e185f..4463ed5 100755 --- a/hooks/edgy/20-setup-apt +++ b/hooks/edgy/20-setup-apt @@ -30,30 +30,17 @@ logMessage Script $0 starting # # Attempt to auto-magically detect the use of a Proxy for apt-get, and -# replicate that setup in our new guest. +# replicate that setup in our new guest via apt-config dump and save +# the setting to the proxy guess file. # -# -# Process any of the present apt-conf setup lines. -# -for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do - - - # - # If the file exists. (Need this in case the literal glob fails.) - # - if [ -e $i ] ; then - - # - # Save the matching line(s) to the proxy guess file. - # - logMessage The use of a proxy detected. - - grep -v '^//' $i | grep -i HTTP::Proxy >>${prefix}/etc/apt/apt.conf.d/proxy-guess - fi -done - +logMessage The use of a proxy detected. +apt-config dump | grep -i Acquire::HTTP::Proxy \ + > ${prefix}/etc/apt/apt.conf.d/proxy-guess +# +# Setup the sources.list file for new installations of Ubuntu GNU/Linux. +# cat < ${prefix}/etc/apt/sources.list # # /etc/apt/sources.list diff --git a/hooks/intrepid/20-setup-apt b/hooks/intrepid/20-setup-apt index a0e185f..4463ed5 100755 --- a/hooks/intrepid/20-setup-apt +++ b/hooks/intrepid/20-setup-apt @@ -30,30 +30,17 @@ logMessage Script $0 starting # # Attempt to auto-magically detect the use of a Proxy for apt-get, and -# replicate that setup in our new guest. +# replicate that setup in our new guest via apt-config dump and save +# the setting to the proxy guess file. # -# -# Process any of the present apt-conf setup lines. -# -for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do - - - # - # If the file exists. (Need this in case the literal glob fails.) - # - if [ -e $i ] ; then - - # - # Save the matching line(s) to the proxy guess file. - # - logMessage The use of a proxy detected. - - grep -v '^//' $i | grep -i HTTP::Proxy >>${prefix}/etc/apt/apt.conf.d/proxy-guess - fi -done - +logMessage The use of a proxy detected. +apt-config dump | grep -i Acquire::HTTP::Proxy \ + > ${prefix}/etc/apt/apt.conf.d/proxy-guess +# +# Setup the sources.list file for new installations of Ubuntu GNU/Linux. +# cat < ${prefix}/etc/apt/sources.list # # /etc/apt/sources.list diff --git a/hooks/karmic/20-setup-apt b/hooks/karmic/20-setup-apt index a0e185f..4463ed5 100755 --- a/hooks/karmic/20-setup-apt +++ b/hooks/karmic/20-setup-apt @@ -30,30 +30,17 @@ logMessage Script $0 starting # # Attempt to auto-magically detect the use of a Proxy for apt-get, and -# replicate that setup in our new guest. +# replicate that setup in our new guest via apt-config dump and save +# the setting to the proxy guess file. # -# -# Process any of the present apt-conf setup lines. -# -for i in /etc/apt/apt.conf $(run-parts --list /etc/apt/apt.conf.d) ; do - - - # - # If the file exists. (Need this in case the literal glob fails.) - # - if [ -e $i ] ; then - - # - # Save the matching line(s) to the proxy guess file. - # - logMessage The use of a proxy detected. - - grep -v '^//' $i | grep -i HTTP::Proxy >>${prefix}/etc/apt/apt.conf.d/proxy-guess - fi -done - +logMessage The use of a proxy detected. +apt-config dump | grep -i Acquire::HTTP::Proxy \ + > ${prefix}/etc/apt/apt.conf.d/proxy-guess +# +# Setup the sources.list file for new installations of Ubuntu GNU/Linux. +# cat < ${prefix}/etc/apt/sources.list # # /etc/apt/sources.list