X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=mk-basefile-big;h=873b7ffb24be2b76aa1c297b7fb7f8f057c69541;hp=370fd8b33e6aecac689641bfdc1b6340bc19e3c1;hb=HEAD;hpb=c47175685b348735b3440e16851dde2cc39b6f3f diff --git a/mk-basefile-big b/mk-basefile-big index 370fd8b..95d2e9f 100755 --- a/mk-basefile-big +++ b/mk-basefile-big @@ -73,14 +73,13 @@ distro=trisquel t=/tmp/dirinstall -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 ||: done rm -rf $t } -_errcatch_cleanup=cleanup myfai-chboot default @@ -101,7 +100,7 @@ rm -f $t/etc/hostname $t/etc/resolv.conf \ $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