X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-debian-toolbox;h=e1b8578374ac79ecb3d414890bb2b4692e93314e;hp=250e2f7e2b8ecd3b990f1acf5924de280efaff19;hb=d802c8aecc3efb8dbd1a9158a0cc77e61013c6c9;hpb=ed3619520fbe5cf5cee8f97120e6f8a5cb833bca

diff --git a/build-debian-toolbox b/build-debian-toolbox
index 250e2f7..e1b8578 100755
--- a/build-debian-toolbox
+++ b/build-debian-toolbox
@@ -10,14 +10,12 @@ 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://github.com/containers/toolbox/pull/380
-if [ ! -e /etc/resolv.conf ]; then
-    ln -sfn /run/host/monitor/resolv.conf /etc/resolv.conf
-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; also add deb-src
+sed -i "s/deb.debian.org/ftp.de.debian.org/; /^deb\b/ { p; s/^deb/deb-src/ }" /etc/apt/sources.list
+
 apt-get update
 apt-get install -y libnss-myhostname sudo eatmydata libcap2-bin
 
@@ -31,13 +29,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