Fix apt-proxy configuration
This commit is contained in:
parent
a8ddc28377
commit
75a12e4399
|
@ -13,3 +13,5 @@ username=user
|
||||||
USERPW='$5$n4TiokMaqws2PC/i$eqDh77it8N/haBU6OeE6WqbBjI0E1IUczp2EJ7Tr4J/'
|
USERPW='$5$n4TiokMaqws2PC/i$eqDh77it8N/haBU6OeE6WqbBjI0E1IUczp2EJ7Tr4J/'
|
||||||
|
|
||||||
SUPRESS_GNOME_INITIAL_SCREEN=1
|
SUPRESS_GNOME_INITIAL_SCREEN=1
|
||||||
|
|
||||||
|
APTPROXY=http://hw4f-fai:3142
|
||||||
|
|
|
@ -9,6 +9,11 @@ deb $ubuntumirror/ubuntu $ubuntudist-updates main restricted universe multiverse
|
||||||
deb $ubuntumirror/ubuntu $ubuntudist-security main restricted universe multiverse
|
deb $ubuntumirror/ubuntu $ubuntudist-security main restricted universe multiverse
|
||||||
EOM
|
EOM
|
||||||
|
|
||||||
|
if [ -n "$APTPROXY" ]; then
|
||||||
|
echo "Acquire::http::Proxy \"$APTPROXY\";" > $target/etc/apt/apt.conf.d/02proxy
|
||||||
|
else
|
||||||
|
rm -f $target/etc/apt/apt.conf.d/02proxy
|
||||||
|
fi
|
||||||
|
|
||||||
# https://lists.uni-koeln.de/pipermail/linux-fai/2016-July/011398.html
|
# https://lists.uni-koeln.de/pipermail/linux-fai/2016-July/011398.html
|
||||||
# In Ubuntu 16.04 (but not 14.04), the locales configuration mechanism has
|
# In Ubuntu 16.04 (but not 14.04), the locales configuration mechanism has
|
||||||
|
|
|
@ -12,5 +12,3 @@ libreoffice-help-de
|
||||||
ubuntu-software
|
ubuntu-software
|
||||||
ubuntu-snappy
|
ubuntu-snappy
|
||||||
snapd
|
snapd
|
||||||
|
|
||||||
APTPROXY=http://hw4f-fai:3142
|
|
||||||
|
|
|
@ -31,5 +31,5 @@ if contains "$DISTS_TO_UPGRADE" "$release"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! "$KEEP_PROXY_FOR_UPGRADE" ]; then
|
if [ ! "$KEEP_PROXY_FOR_UPGRADE" ]; then
|
||||||
$ROOTCMD rm -f /etc/apt/apt.conf.d/00-proxy
|
rm -f $target/etc/apt/apt.conf.d/02proxy
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue