github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-01-28 12:29:04 +00:00
Code Releases Activity

Use apt-config dump to determine Dom0's APT proxy settings.

Browse Source 
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.
This commit is contained in:
Axel Beckert
2010-08-03 15:59:10 +02:00
parent 73528d94e7
commit 0f99b8b995
5 changed files with 37 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
hooks/dapper/20-setup-apt
View File

@@ -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.
#
logMessage The use of a proxy detected.
apt-config dump | grep -i Acquire::HTTP::Proxy \
> ${prefix}/etc/apt/apt.conf.d/proxy-guess
#
# Process any of the present apt-conf setup lines.
# Setup the sources.list file for new installations of Ubuntu GNU/Linux.
#
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
cat <<E_O_APT > ${prefix}/etc/apt/sources.list
#
# /etc/apt/sources.list

24
hooks/debian/20-setup-apt
View File

@@ -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
#

29
hooks/edgy/20-setup-apt
View File

@@ -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.
#
logMessage The use of a proxy detected.
apt-config dump | grep -i Acquire::HTTP::Proxy \
> ${prefix}/etc/apt/apt.conf.d/proxy-guess
#
# Process any of the present apt-conf setup lines.
# Setup the sources.list file for new installations of Ubuntu GNU/Linux.
#
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
cat <<E_O_APT > ${prefix}/etc/apt/sources.list
#
# /etc/apt/sources.list

29
hooks/intrepid/20-setup-apt
View File

@@ -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.
#
logMessage The use of a proxy detected.
apt-config dump | grep -i Acquire::HTTP::Proxy \
> ${prefix}/etc/apt/apt.conf.d/proxy-guess
#
# Process any of the present apt-conf setup lines.
# Setup the sources.list file for new installations of Ubuntu GNU/Linux.
#
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
cat <<E_O_APT > ${prefix}/etc/apt/sources.list
#
# /etc/apt/sources.list

29
hooks/karmic/20-setup-apt
View File

@@ -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.
#
logMessage The use of a proxy detected.
apt-config dump | grep -i Acquire::HTTP::Proxy \
> ${prefix}/etc/apt/apt.conf.d/proxy-guess
#
# Process any of the present apt-conf setup lines.
# Setup the sources.list file for new installations of Ubuntu GNU/Linux.
#
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
cat <<E_O_APT > ${prefix}/etc/apt/sources.list
#
# /etc/apt/sources.list