X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-debian-toolbox;h=13ee84dba55fd4fd8442a29aeff5bab68937259c;hp=fbeb13b2f95bc7c17c1d9916421692ec911fa566;hb=6c6be615a01e1c9cf838a6288242ae3642ee5a05;hpb=26be63bc0fe7468eb0ef4bdbc8b2eb51e6bf72d2

diff --git a/build-debian-toolbox b/build-debian-toolbox
index fbeb13b..13ee84d 100755
--- a/build-debian-toolbox
+++ b/build-debian-toolbox
@@ -5,19 +5,18 @@ RELEASE=${1:-sid}
 DISTRO=${2:-debian}
 
 toolbox rm -f $RELEASE || true
+podman pull docker.io/$DISTRO:$RELEASE
 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
 
+# otherwise installing systemd fails
+umount /var/log/journal
+
 apt-get update
 apt-get install -y libnss-myhostname sudo eatmydata libcap2-bin
 
@@ -26,18 +25,18 @@ sed -i "s/nullok_secure/nullok/" /etc/pam.d/common-auth
 '
 
 toolbox run --container $RELEASE sh -exc '
-# otherwise installing systemd fails
-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 wget gnupg ubuntu-dev-tools python3-debian fakeroot libdistro-info-perl
+sudo eatmydata apt-get install -y --no-install-recommends build-essential 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 openssh-client
+
+# autopkgtest
+sudo eatmydata apt-get install -y --no-install-recommends autopkgtest qemu-system-x86 qemu-utils genisoimage
 '
 
 toolbox enter --container $RELEASE