Skip to content
Snippets Groups Projects
Commit 08c4ceba authored by Adam Lewenberg's avatar Adam Lewenberg
Browse files

add --override-config to pbiulder update

parent 85255d69
No related branches found
No related tags found
No related merge requests found
...@@ -32,13 +32,24 @@ ignore="$ignore"'|W:.No local .etc.mailname to copy' ...@@ -32,13 +32,24 @@ ignore="$ignore"'|W:.No local .etc.mailname to copy'
# For more information, see # For more information, see
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869425 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869425
# The original base.tgz (.cow directory) created using "cowbuilder
# --create" does not contain the Stanford-specific apt source files that
# we add later via Puppet. Because of this, when we do a "cowbuilder
# update" on the .cow directory we see this error:
#
# --override-config is not set; not updating apt.conf Read the manpage for details.
#
# This is telling us that the apt configuration has been changed relative
# to the original tar.gz image. To get around this we add
# --override-config option to the cowbuilder update command.
basedir=/var/cache/pbuilder basedir=/var/cache/pbuilder
for dist in <%= dists_to_update %> ; do for dist in <%= dists_to_update %> ; do
if [ ! -d $basedir/base-$dist.cow ] ; then if [ ! -d $basedir/base-$dist.cow ] ; then
continue continue
fi fi
chroot $basedir/base-$dist.cow apt-get update > /dev/null chroot $basedir/base-$dist.cow apt-get update > /dev/null
(cowbuilder --update --basepath $basedir/base-$dist.cow \ (cowbuilder --update --override-config --basepath $basedir/base-$dist.cow \
--distribution $dist --configfile /etc/pbuilder/$dist \ --distribution $dist --configfile /etc/pbuilder/$dist \
2>&1 > /dev/null) | egrep -v "$ignore" 2>&1 > /dev/null) | egrep -v "$ignore"
done done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment