t=/tmp/dirinstall
-errcatch-cleanup() {
+err-cleanup() {
sed -i 's/^#LOGUSER=/LOGUSER=/' /etc/fai/fai.conf
for d in proc var/lib/dpkg var/cache; do
umount -R $t/$d ||:
$t/var/lib/apt/lists/*_* $t/usr/bin/qemu-*-static \
$t/etc/udev/rules.d/70-persistent-net.rules
echo | dd of=$t/etc/machine-id
-tar --one-file-system -C $t -cf - . | gzip > /a/bin/fai-basefiles/basefiles/${distver^^}64BIG.tar.gz
+tar --one-file-system -C $t -cf - . | zstd -9 > /a/bin/fai-basefiles/basefiles/${distver^^}64BIG.tar.zst
cleanup