X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-debian-toolbox;h=82868761747be77a1cbcd88b91e5523d48b869b3;hp=13ee84dba55fd4fd8442a29aeff5bab68937259c;hb=HEAD;hpb=1e02b574d361c9bfa8282c1b98e21d68ed1aae4e

diff --git a/build-debian-toolbox b/build-debian-toolbox
index 13ee84d..c1d139a 100755
--- a/build-debian-toolbox
+++ b/build-debian-toolbox
@@ -17,11 +17,19 @@ echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/unsafe-io
 # otherwise installing systemd fails
 umount /var/log/journal
 
+# enable sources
+if [ -e /etc/apt/sources.list.d/debian.sources ]; then
+    sed -i "/^Types:/ s/deb$/deb deb-src/" /etc/apt/sources.list.d/debian.sources
+fi
+
 apt-get update
 apt-get install -y libnss-myhostname sudo eatmydata libcap2-bin
 
 # allow sudo with empty password
 sed -i "s/nullok_secure/nullok/" /etc/pam.d/common-auth
+
+# unbreak slow host name resolution
+sed -i "/^hosts:/ s/files dns myhostname/files myhostname dns/" /etc/nsswitch.conf
 '
 
 toolbox run --container $RELEASE sh -exc '
@@ -30,13 +38,19 @@ toolbox run --container $RELEASE sh -exc '
 echo "${ID}-${VERSION_ID:-sid}" | sudo tee /etc/hostname
 sudo hostname -F /etc/hostname
 
-sudo eatmydata apt-get -y dist-upgrade
+sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get -y dist-upgrade
 
 # development tools
-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
+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 flatpak-xdg-utils
 
 # autopkgtest
 sudo eatmydata apt-get install -y --no-install-recommends autopkgtest qemu-system-x86 qemu-utils genisoimage
+
+# commands to forward to the host
+for cmd in podman toolbox; do
+    printf "#!/bin/sh\n/usr/libexec/flatpak-xdg-utils/flatpak-spawn --host $cmd \42\$@\42\n" | sudo tee /usr/local/bin/$cmd >/dev/null
+    sudo chmod a+x /usr/local/bin/$cmd
+done
 '
 
 toolbox enter --container $RELEASE