added tagfile and make use of it in modules
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
# * PROXY_SRV_PORT: Working port for general purpose proxy if one declared
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
export VER_upgrade_dist="0.2.1"
|
||||
export VER_upgrade_dist="0.2.2"
|
||||
|
||||
# As aptitude might fail if clock is too far from real time, we need to depend
|
||||
# on ntp
|
||||
@@ -29,7 +29,7 @@ upgrade_dist()
|
||||
# We backup entire apt dir as future version will normalise source.list files
|
||||
backupdist /etc/apt
|
||||
prnt I "Basic apt configuration..."
|
||||
echo "# Generated automatically on $(stdtime) by $0" > $norecommend
|
||||
tagfile $norecommend
|
||||
echo 'APT::Install-Recommends "false";' >> $norecommends
|
||||
echo 'APT::AutoRemove::RecommendsImportant "false";' >> $norecommends
|
||||
echo 'APT::AutoRemove::SuggestsImportant "false";' >> $norecommends
|
||||
@@ -42,10 +42,10 @@ upgrade_dist()
|
||||
die 60
|
||||
)
|
||||
fi
|
||||
echo "# Generated automatically on $(stdtime) by $0" > $proxyfile
|
||||
tagfile $proxyfile
|
||||
echo "Acquire::http::Proxy \"http://${PROXY_APT}:${PROXY_APT_PORT}\";" >> $proxyfile
|
||||
elif [[ -n $PROXY_SRV ]]; then
|
||||
echo "# Generated automatically on $(stdtime) by $0" > $proxyfile
|
||||
tagfile $proxyfile
|
||||
echo "Acquire::http::Proxy \"http://${PROXY_SRV}:${PROXY_SRV_PORT}\";" >> $proxyfile
|
||||
else
|
||||
prnt I "No proxy configured, nothing to do."
|
||||
|
||||
Reference in New Issue
Block a user