X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-debian-toolbox;h=ce0318324809fe4cd3fc4e6a1dbb62d3b8490403;hp=3b22f89f3a24e5470ad390f8fae925891434d2ac;hb=f0b67cfbd6684fcc0ceff76aae57cb0e70e38671;hpb=64f593d8daa1050034aebf264edbfa2245298589

diff --git a/build-debian-toolbox b/build-debian-toolbox
index 3b22f89..ce03183 100755
--- a/build-debian-toolbox
+++ b/build-debian-toolbox
@@ -10,7 +10,7 @@ toolbox -y create -c $RELEASE --image docker.io/$DISTRO:$RELEASE
 # can't do that with toolbox run yet, as we need to install sudo first
 podman start $RELEASE
 podman exec -it $RELEASE sh -exc '
-# https://bugzilla.redhat.com/show_bug.cgi?id=1785244
+# https://bugzilla.redhat.com/show_bug.cgi?id=1785244, https://github.com/containers/toolbox/pull/380
 if [ ! -e /etc/resolv.conf ]; then
     ln -sfn /run/host/monitor/resolv.conf /etc/resolv.conf
 fi
@@ -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