build-devtoolbox: Drop waiverdb-cli, bodhi updates waive can do that

[bin.git] / build-debian-toolbox

diff --git a/build-debian-toolbox b/build-debian-toolbox
index 250e2f7e2b8ecd3b990f1acf5924de280efaff19..ce0318324809fe4cd3fc4e6a1dbb62d3b8490403 100755 (executable)
--- a/build-debian-toolbox
+++ b/build-debian-toolbox
@@ -18,6 +18,9 @@ fi
 # go-faster apt/dpkg
 echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/unsafe-io
 
+# location based redirector gets it wrong with company VPN
+sed -i "s/deb.debian.org/ftp.de.debian.org/" /etc/apt/sources.list
+
 apt-get update
 apt-get install -y libnss-myhostname sudo eatmydata libcap2-bin
 
@@ -31,13 +34,13 @@ sudo umount /var/log/journal
 
 # useful hostname
 . /etc/os-release
-echo "${ID}-${VERSION_ID}" | sudo tee /etc/hostname
+echo "${ID}-${VERSION_ID:-sid}" | sudo tee /etc/hostname
 sudo hostname -F /etc/hostname
 
 sudo eatmydata apt-get -y dist-upgrade
 
 # development tools
-sudo eatmydata apt-get install -y --no-install-recommends git-buildpackage libwww-perl less vim lintian debhelper manpages-dev git dput pristine-tar bash-completion python-keyrings.alt wget gnupg ubuntu-dev-tools python3-debian fakeroot libdistro-info-perl
+sudo eatmydata apt-get install -y --no-install-recommends git-buildpackage libwww-perl less vim lintian debhelper manpages-dev git dput pristine-tar bash-completion wget gnupg ubuntu-dev-tools python3-debian fakeroot libdistro-info-perl
 '
 
 toolbox enter --container $RELEASE